Changeset 1588 for MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_model.js

Timestamp:

10/21/11 10:29:20 (13 years ago)

Author:

gaba

Message:

squery removing changes

File:

• MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_model.js (modified) (13 diffs)

MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_model.js

@@ -211 +211 @@
         this.columns = columns;         // string
         this.query = query;              //sctext
-        //this.squery = squery;
         this.listid = "";
         this.container = {};
@@ -314 +313 @@
         }
 
-        /*
-        if (json["squerystring"] == "[NULL]"){
-                this.squery = null;
-        } else {
-                this.squery = json["squerystring"];     
-        }
-*/
         this.columns = columns_text;
         
@@ -445 +437 @@
         var params = "?";
         if (this.query != null) {
-                params = params + "query=" + escape(this.query) + "&";
+                escaped_sq = escape(this.query);
+                //escaped_sq =escape(this.query).replace(/%20/g,"%2520").replace(/\%2[27]/g,"%2522") ;
+                //escaped_sq = escaped_sq.replace(/%7C/g,"%257C").replace(/\+/g,"%2B"); 
+                //params = params + "query=" + escape(this.query) + "&";
+                params = params + "query=" + escaped_sq + "&";
         }
         /*
@@ -490 +486 @@
         var str = "";
         var coll = (this.getcollectiontext("name") != "" ) ? " in " + this.getcollectiontext("name") : "";
-        //str = Query.queryliststring(this.squery,this.query) + coll + " @" + this.repository.toString();
-        str = Query.queryliststring(this.query) + coll + " @" + this.repository.toString();
+        str = Query.simplequerystring(this.query) + coll + " @" + this.repository.toString();
         return str;
 };
@@ -559 +554 @@
         var jsonq = {"id":this.id,
                                  "name":"",
-                             //"squerystring":this.squery, 
-                                 "querystring":this.query,      
+                             "querystring":this.query,  
                                  "searchclauses":"null" ,
                                  "collections" : json_coll, 
@@ -651 +645 @@
 Query.fullformatstring = function (json) {
         var qs = json.querystring;
-        //var sqs = json.squerystring;
         
         if (qs == "[NULL]") {
@@ -657 +650 @@
         }
         
-        /*if (sqs == "[NULL]") {
-                sqs = null;
-        }
-        */
+        
         var collection_text = Query.collectiontext(json);
         
         var full_str = "";
         var len = formatquerystring_len;
-        /*
-        if (sqs != null) {
-                if (sqs.length > len){
-                        full_str = sqs.substring(0,len) + "..| ";
-                } else {
-                        sqs = sqs + "                                     ";
-                        full_str = sqs.substring(0,len) + "  | ";
-                }
-        }
-        */
+        
         if (qs != null) {
                 qs = Query.simplequerystring(qs);
@@ -691 +672 @@
         
         return full_str;
-};
-
-Query.queryliststring = function(query) {
-        var s_squery = "";
-        var s_query = "";
-        var str = "";
-        
-        /*if (squery != null){
-                s_squery = squery;
-        }
-        
-        if (query != null){
-                s_query = query;
-        }
-        if (s_squery.length != 0 && s_query.length != 0){
-                str = squery + " & (" + Query.simplequerystring(query) +  ")";
-        } else if (s_squery.length != 0) {
-                str = squery;
-        } else {
-                str =  Query.simplequerystring(query);
-        }
-        */
-        
-        str =  Query.simplequerystring(query);
-        return str;
 };
 
@@ -770 +726 @@
 
 Query.prototype.render = function () {
-/*
-        var x = "<div id='" + this.listid + "' class='query_wrapper ui-widget' ><div class='query_header ui-widget-header ui-state-default ui-corner-top'>" +
-        "<span class='cmd cmd_get'></span><span class='cmd cmd_save'></span><span class='cmd cmd_del'> </span>" +
-        "<span class='query_id'>" +     this.listid + "</span>: <span class='query'>" +
-        this.getcollectiontext("name") + ":" + Query.queryliststring(this.squery, this.query) + ", repository:" + this.repository.toString() + "</span>" + 
-                        "<a class='cmd cmd_xml' target='_blank' href='" + this.link("xml") + "'>xml</a> <a class='cmd cmd_link' target='_blank' href='" + this.link("fullpage") + "' >link</a></div>" +
-                //      <span class='cmd cmd-xml'></span><span class='cmd cmd-page'></span><span class='cmd cmd-link'></span></div>" +          
-                        //"<div class='ui-context-dialog columns-wrapper'><div class='query-columns'></div><span class='cmd cmd_del'></span></div><div class='result ui-widget-content ui-corner-bottom'></div>";
-                        "<div class='result ui-widget-content ui-corner-bottom'></div>";
-                        */
-        /*
-        var x = $('#querylistelement').html().toString();
-        x.replace('querylistelement', this.listid);
-        $(x).find(".query-id").text(this.listid);
-        $(x).children().children(".query").text(this.getcollectiontext("name") + ":" + Query.queryliststring(this.squery, this.query) + ", repository:" + this.repository.toString());
-        */
+
         // FIXME: this is not nice, there should be a function providing the formatted string of the query.
         //var coll = (this.getcollectiontext("name") != "" ) ? " in " + this.getcollectiontext("name") : "";  
@@ -792 +733 @@
         "<span class='query_id'>" + this.listid + "</span>: <span class='query'>" +
         this.toString() + 
-        //Query.queryliststring(this.squery, this.query) + coll + " @" + this.repository.toString() + 
         "</span>" + 
                         "</div>" +
@@ -834 +774 @@
          
                 // JSON conversion
-         /*
-                if (this.query.length == 0){
-                        xqstring = "[NULL]";
-                } else {
-                        xqstring = this.query;
-                }
-                if (this.squery.length == 0){
-                        xsquery = "[NULL]";
-                } else {
-                        xsquery = this.squery;
-                }
-         */
-                //var jsonq = {"squerystring":this.squery, "querystring":this.query, "searchclauses":"null" , "collections" : this.json_coll, "columns" : this.json_cols};
-         var jsonq = { "querystring":this.query, "searchclauses":"null" , "collections" : this.json_coll, "columns" : this.json_cols};
+         var jsonq = { "querystring":this.query, "searchclauses":"null" , "collections" : this.json_coll, "columns" : this.json_cols};
 
                 var uri = "?query=" + JSON.stringify(jsonq) + "&startItem=" + this.startItem + "&maximumItems=" + this.maximumItems;
@@ -1079 +1006 @@
                 
         },
-/*
-        getsquery: function(qid) {
-                var qstring = "";
-                
-                for (var i = 0; i < this.queries.length; i++) {
-                        if (this.queries[i].listid == qid) {
-                                qstring = this.queries[i].squery;
-                        } 
-                }
-                if (qstring == null){
-                        qstring = "";
-                }
-                return qstring;
-        },
-        */
         getquerystring: function(qid) {
                 var qstring = "";
@@ -1194 +1106 @@
                 return query;
         },
-        /*
-        next: function(qid,pages){
-                var query = queryset.queries[qid.substring(1)-1];
-                var start = 0;
-                var num = 0;
-                var max_value = $('#' + qid ).find('.result-header').attr("max_value");
-                
-                if (parseInt(query.startItem) + pages * page_record_count >= 1){
-                        start = parseInt(query.startItem) + pages * page_record_count ;
-                } else if (parseInt(query.startItem) + pages * page_record_count + page_record_count - 1 >= 1){
-                        start = 1 ;
-                }
-                if (start > 0){
-                        if (start + page_record_count - 1 <= max_value) {
-                                num = page_record_count;
-                        } else if (start <= max_value){
-                                num = max_value - start;
-                        }
-                
-                        if (num > 0){
-                                query.startItem =       start;
-                                query.maximumItems = num;
-                                query.resubmit();
-                        }
-                }
-                
-        },
-        */
         recorddetailselection: function(recordrow){
                 if (this.recordrowselected != undefined){