Changeset 1626

Timestamp:

11/22/11 21:04:35 (12 years ago)

Author:

gaba

Message:

 

Location:

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model

Files:

• Query.java (modified) (7 diffs)
• Result.java (modified) (1 diff)

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/Query.java

@@ -198 +198 @@
          */
         public String getParam(String key) {
-                String v = null;
+                String v = "";
                 if (!(params.get(key)==null)) v=(String)params.get(key)[0];
                 return v;
@@ -209 +209 @@
         
         public String getStatus() {
-                if (type.equals(Query.RECORDSET) && query_cql== null && (this.getQueryString() != "")) {
+                if (type.equals(Query.RECORDSET) && query_cql== null && (!getParam("query").equals(""))) {
                         return Query.PARSEERROR;
                 } else {
@@ -225 +225 @@
         }
 
-        public String getQueryString() {
-                //return query_string;
-                if (getParam("query") == null){
-                        return "";
-                } 
-                return  getParam("query");
-        }
 
         //public void setFullQueryString(String queryString) {
         public void setFullQueryString() {
                 
-                String query_string = this.getQueryString();
+                String query_string = getParam("query");
                 
                 //if (queryString.trim().length() == 0){
@@ -445 +438 @@
                         //  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();
+                        String corrid = getParam("query").replace(":","\\:").toLowerCase();
                         log.debug("Query.toURLParam.corrid=" + corrid);
                         targetRequest = "//MdSelfLink[ft:query(.,'" + corrid + "')]";                    
@@ -454 +447 @@
                                         targetRequest = toXPath() + "&collection=" + getParam("collection");    
                                 }
-                                if (getParam("startItem") != null) {
+                                if (!getParam("startItem").equals("")) {
                                         targetRequest = targetRequest +  "&startItem=" + getParam("startItem");
                                 }
-                                if (getParam("maximumItems") != null) {
+                                if (!getParam("maximumItems").equals("")) {
                                         targetRequest = targetRequest +  "&maxItems=" + getParam("maximumItems");
                                 }
-                                if ((getParam("options") != null)) {
+                                if ((!getParam("options").equals(""))) {
                                         targetRequest = targetRequest +  "&format=xml-" + getParam("options");
                                 }
@@ -478 +471 @@
                 CQLParser parser = new CQLParser();             
                 // cannot accept '-' at the CQL beginning
-                String local_full_query_string = this.getQueryString();
+                String local_full_query_string = getParam("query");
                 local_full_query_string = local_full_query_string.replace("-", "%2D");
 
@@ -555 +548 @@
         public String fromCMDIndex2Xpath() {
                 String xpath = "";
-                String query_string= getQueryString();
+                String query_string= getParam("query");
                 if (query_string.contains(":")) {
                         int delim_index = query_string.indexOf(":");

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/Result.java

@@ -95 +95 @@
                         
                 header = "<header>";
-                header += "<userquery>" + parentQuery.getQueryString() + "</userquery>"; 
+                header += "<userquery>" + parentQuery.getParam("query") + "</userquery>"; 
                 header += "<xpathquery>" + parentQuery.toXPath() + "</xpathquery>";             
                 header += "</header>";