Changeset 1029 for MDService2/trunk/MDService2/src/eu/clarin/cmdi

Timestamp:

01/02/11 19:30:58 (13 years ago)

Author:

vronk

Message:

changes to columns, terms (unfinished) ; .ui-context-dialog

Location:

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice

Files:

• action/Cache.java (modified) (1 diff)
• action/CollectionProxyAction.java (modified) (1 diff)
• action/GenericProxyAction.java (modified) (2 diffs)
• action/MDRepoProxyAction.java (modified) (2 diffs)
• model/Query.java (modified) (4 diffs)

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Cache.java

@@ -172 +172 @@
                 }
                 
-                DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-ddThh:mm:ss");
+                DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
                 e.setAttribute("date", dateFormat.format(new Date()).toString());
                 cacheindex_doc.getFirstChild().appendChild(e);

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/CollectionProxyAction.java

@@ -34 +34 @@
                 //targetURL =new URL( getBaseURL(), getActionkey());
                 //FIXME: get maxdepth-constant out of here !!
-                targetURL = new URL(getBaseURL(), "?operation=getCollections&maxdepth=3&collection=");
+                targetURL = new URL(getBaseURL(), "?operation=getCollections&maxdepth=2&collection=");
                 //Admin.notifyUser("CollectionProxy.targetURL:" + targetURL);
 

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java

@@ -56 +56 @@
         private int maxdepth;
         private String format;
+        private String options;
         private String actionContentType;
         private String userMsg;
@@ -142 +143 @@
         }
 
+        public String getOptions() {
+                return options;
+        }
+
+        public void setOptions(String options) {
+                this.options = options;
+        }
+
         public String getActionContentType() {
-                if (format.toLowerCase().equals("xml")) {
+                if (format.toLowerCase().startsWith("html")) {
+                        this.actionContentType = "text/html";
+                } else {
                         this.actionContentType = "text/xml";
-                } else {
-                        this.actionContentType = "text/html";
                 }
                 

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/MDRepoProxyAction.java

@@ -115 +115 @@
                         query.setMaximumRecords(getMaximumRecords());
                         query.setStartRecord(getStartRecord());
+                        query.setOptions(getOptions());
                         //Admin.notifyUser("MDRPA.records:" + query.getStartRecord());
                         //Admin.notifyUser("MDRPA.records:" + query.getMaximumRecords());
@@ -120 +121 @@
                         
                         targetURL =new URL( getBaseURL(), urls.get(getActionkey()) + query.toURLParam() );
+                        Admin.notifyUser("MDRPA.targetURL.query.toURLParam:" + query.toURLParam());
                         Admin.notifyUser("MDRPA.targetURL:" + targetURL);
                 return targetURL;

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java

@@ -58 +58 @@
         private String maximumRecords = "50";
         private String squery = null;
+        private String options = null;
         private int maxdepth=1;
         
@@ -199 +200 @@
         }
         
+        public String getOptions() {
+                return options;
+        }
+
+        public void setOptions(String options) {
+                this.options = options;
+        }
+
         public String getStartRecord() {
                 return startRecord;
@@ -312 +321 @@
                         //  2010-07-11 this is just a hack, because url-encoding the handle acted strange
                         //String corrid = getQueryString().replace('_', '/');
-                        String corrid = getQueryString();
-                        targetRequest = "//MdSelfLink[.='" + corrid + "']";                      
+                        //  2010-12-28 needed for the lucene-index to recognize..
+                                //  probably not the best place to handle -> move to repository: sanitize-query? 
+                        String corrid = getQueryString().replace(":","\\:").toLowerCase();
+                        Admin.notifyUser("Query.toURLParam.corrid=" + corrid);
+                        targetRequest = "//MdSelfLink[ft:query(.,'" + corrid + "')]";                    
                 } else { 
                         if (query_cql == null){
@@ -322 +334 @@
                         if ((startRecord != null) && (maximumRecords != null)) {
                                 targetRequest = targetRequest +  "&startRecord=" + getStartRecord() + "&iend=" + getMaximumRecords();
+                        }
+                        if ((options != null)) {
+                                targetRequest = targetRequest +  "&format=xml-" + getOptions();
                         }
                 }