Changeset 1032

Timestamp:

01/03/11 22:41:08 (13 years ago)

Author:

gaba

Message:

withSumary

Location:

MDService2/trunk/MDService2/WebContent

Files:

• index.jsp (modified) (1 diff)
• scripts/mdservice2_ui.js (modified) (7 diffs)
• scripts/mdservice_model.js (modified) (5 diffs)

MDService2/trunk/MDService2/WebContent/index.jsp

@@ -119 +119 @@
                                 <input type="text" id="input-simplequery" name="_query"  />
                                 <input type="submit"  value="submit" id="submit-query"/>
+                                <input type="checkbox" checked="false" id="input-withsumary" name="WS"/>
                                 <input type="text" id="query_list" name="_query_" />    
                                 <table class="cmds-ui-elem-stretch"><tr>

MDService2/trunk/MDService2/WebContent/scripts/mdservice2_ui.js

@@ -102 +102 @@
 }
 // TODO multiple collections
-function submit_query (columns, query, squery) {
+function submit_query (columns, query, squery, ws) {
         notifyUser("processing query");
         
@@ -114 +114 @@
         var q = new Query(collections, columns, query, squery); //actions.collections.current, query );
         q.repository = getSelectedRepository();
+        if (ws) {
+                q.options = "withSumary";
+        }
         notifyUser("submit_query:" + q.query_uri(),'debug');
         queryset.addquery(q);
@@ -1128 +1131 @@
                         notifyUser(searchclauseset.sctext,'debug');
                         //submit_query ($('#columns_list').attr("value"),searchclauseset.sctext, $('#input-simplequery').attr("value"));                        
-                        submit_query (columns_widget.getColumnsListText(),searchclauseset.sctext, $('#input-simplequery').attr("value"));
+                        submit_query (columns_widget.getColumnsListText(),searchclauseset.sctext, $('#input-simplequery').attr("value"), $('#input-withsumary').attr("checked"));
         });
 
@@ -1154 +1157 @@
                 var squery = "";
                 var bookmark = "0";
+                var json_options = "null";
                 
                 if ($(this).parents('.result').length > 0){
@@ -1165 +1169 @@
                         json_cols = queryset.getcolumns(qid);
                         squery = queryset.getsquery(qid);
+                        json_options = queryset.getoptions(qid);
                 }
                  
@@ -1181 +1186 @@
                         jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"] = [{}];
                 }
-                var jsonq = {"name":"", "squerystring":squery, "querystring":qstring,"searchclauses":"null" , "collections" : json_coll, "columns" : json_cols, "bookmark" : bookmark};
+                var jsonq = {"name":"", "squerystring":squery, "querystring":qstring,"searchclauses":"null" , "collections" : json_coll, "columns" : json_cols, "options" : json_options, "bookmark" : bookmark};
                 
                 var name;
@@ -1454 +1459 @@
                 columns_widget.load(query.columns.split(','));
                 $('#input-simplequery').attr("value",query.squery);
+                $('#input-withsumary').attr("checked",(query.options != null));
         } 
 

MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js

@@ -24 +24 @@
         // repository
         this.repository = 1;
+        this.options = null;
         
         this.columns_widget = null;
@@ -61 +62 @@
         }
         this.columns = columns_text;
+        
+        var options_text = "";
+        if (json.options == undefined) {
+                this.options = null;
+        } else {
+                if (json.options != "null"){
+                        $.each(json.options,function(i,item){
+                                options_text = options_text + "," + item;
+                        });
+                        if (options_text.length > 1) {
+                                options_text = options_text.substring(1);       
+                        }
+                        this.options = options_text;
+                } else {
+                        this.options = null;
+                }
+        }
+        
 };
 
@@ -80 +99 @@
         }
         params = params + "collection=" + this.getcollectiontext("index") + "&columns=" + this.getcolumnstext() + "&startRecord=" + this.startRecord + "&maximumRecords=" + this.maximumRecords + "&repository=" + this.repository;
+        if  (this.options != null) {
+                params = params + "&options=withSumary";
+        }
         return params;
         //return $.param(this.query);
@@ -265 +287 @@
         "<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) + "</span>" +
+        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>" +          
@@ -548 +570 @@
                 return json_cols;
         },
-        
+        getoptions: function(qid) {
+                var opts = null;
+                var json_opts;
+                
+                for (var i = 0; i < this.queries.length; i++) {
+                        if (this.queries[i].listid == qid) {
+                                opts = this.queries[i].options;
+                        } 
+                }
+                
+                if (opts != null) {
+                        json_opts = [{}];
+                        json_opts[0] = opts;
+                }
+                return opts;
+        },
         resubmit: function(qid){
                 var query = queryset.queries[qid.substring(1)-1];