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

Timestamp:

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

Author:

vronk

Message:

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

File:

• MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java (modified) (4 diffs)

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();
                         }
                 }