Changeset 1069 for MDService2/trunk/MDService2/WebContent

Timestamp:

01/13/11 23:32:28 (13 years ago)

Author:

gaba

Message:

77,78,81,82

Location:

MDService2/trunk/MDService2/WebContent

Files:

• index.jsp (modified) (2 diffs)
• scripts/mdservice2_ui.js (modified) (6 diffs)
• scripts/mdservice_model.js (modified) (10 diffs)

MDService2/trunk/MDService2/WebContent/index.jsp

@@ -54 +54 @@
                 <div class="header">Public Space</div>
                 <div id="serverqs" class="content" data="">
+                        <!-- 
                         <div id="repositories" >                
                         <label>Repositories</label><select id="repositories_select" ></select>
                         </div>
+                         -->
                         <div id="serverquerysets" >             
                         <label>Querysets</label><select id="serverqts_select" ></select>
@@ -140 +142 @@
                                          -->    
                                 </td>           
-                                <td><input type="checkbox" checked="false" id="input-withsummary" name="WS"/><label>with Summary</label></td>        
+                                <td><input type="checkbox" checked="false" id="input-withsummary" name="WS"/><label>with Summary</label></td>  
+                                <td><div id="repositories" >            
+                                                <select id="repositories_select" ><label>Repository</label></select>
+                                                </div>
+                                        </td>      
                                 </tr></table>           
                         </s:form>

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

@@ -433 +433 @@
         '<div class="cmds-elem-prop"><span class="label">columns:</span><span class="value">' + Query.columnstext(json) + '</span></div>' +
         '<div class="cmds-elem-prop"><span class="label">time:</span><span class="value">' + timestr + '</span></div>' +
-        //'<div class="cmds-elem-prop"><span class="label">startRecord:</span><span class="value">' + Query.startRecord + '</span></div>' +
-        //'<div class="cmds-elem-prop"><span class="label">maxRecord:</span><span class="value">' + Query.maximumRecords + '</span></div>' +
+        //'<div class="cmds-elem-prop"><span class="label">startItem:</span><span class="value">' + Query.startItem + '</span></div>' +
+        //'<div class="cmds-elem-prop"><span class="label">maxItems:</span><span class="value">' + Query.maximumItems + '</span></div>' +
         //'<div class="cmds-elem-prop"><span class="label">repository:</span><span class="value">' + Query.repository + '</span></div>' +
         '<div class="cmds-elem-prop"><span class="label">bookmark:</span><span class="value">' + json.bookmark + '</span></div>' +
@@ -981 +981 @@
         var squery = params["squery"];
         var collection = params["collection"];
-        var startRecord = params["startRecords"];
-        var numRecords = params["numRecords"];
+        var startItem = params["startItem"];
+        var maximumItems = params["maximumItems"];
         var repository = params["repository"];
         var columns = params["columns"];
@@ -997 +997 @@
                         columns = "";
                 }
-                if (startRecord == undefined) {
-                        startRecord = 1;
-                }
-                if (numRecords == undefined) {
-                        numRecords = 10;
+                if (startItem == undefined) {
+                        startItem = 1;
+                }
+                if (maximumItems == undefined) {
+                        maximumItems = 10;
                 }
                 if (repository == undefined) {
@@ -1021 +1021 @@
                 
                 var query = new Query(collections, columns, q, squery);
-                query.startRecord = startRecord;
-                query.numRecords = numRecords;
+                query.startItem = startItem;
+                query.maximumItems = maximumItems;
                 query.repository = repository;
                 
@@ -1146 +1146 @@
         
         $('.result .cmd_detail').live('click',  function(event) {       
-        
-                var uri = $(this).parent().find("a").attr('href'); // + " body";
+                var qid = $(this).closest('.query_wrapper').attr('id');
+                var query = queryset.getQuery(qid);
+                
+                var uri = $(this).parent().find("a").attr('href') + "?repository=" + query.repository; // + " body";
                 $.get(uri, showDetail,'html');
         });
@@ -1500 +1502 @@
         $('.cmds-ui-block .content').addClass('ui-widget-content ui-corner-bottom');
         $('.cmds-ui-block .header').click(function() {
-                $(this).next().toggle('fast');
+                if ($(this).parent().attr("id") != "public-space"){
+                        $(this).next().toggle('fast');
+                }
                 return false;
         }).next().hide();

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

@@ -19 +19 @@
         this.container = {};
         // page
-        this.startRecord = 1;
-        this.maximumRecords = parseInt(this.startRecord) + page_record_count - 1;
+        this.startItem = 1;
+        this.maximumItems = parseInt(this.startItem) + page_record_count - 1;
         
         // repository
@@ -116 +116 @@
                 params = params + "squery=" + escape(this.squery).replace("%20","%2520") + "&";
         }
-        params = params + "collection=" + this.getcollectiontext("index") + "&columns=" + this.getcolumnstext() + "&startRecord=" + this.startRecord + "&maximumRecords=" + this.maximumRecords + "&repository=" + this.repository;
+        params = params + "collection=" + this.getcollectiontext("index") + "&columns=" + this.getcolumnstext() + "&startItem=" + this.startItem + "&maximumItems=" + this.maximumItems + "&repository=" + this.repository;
         if  (this.options != null) {
                 params = params + "&options=withSummary";
@@ -131 +131 @@
                                  "collections" : this.getcollectiontext("index"), 
                                  "columns" : this.columns,
-                                 "startRecord" : this.startRecord,
-                                 "maximumRecords" : this.maximumRecords};
+                                 "startItem" : this.startItem,
+                                 "maximumItems" : this.maximumItems};
         return JSON.stringify(jsonq);
 };
@@ -351 +351 @@
         //this.columns_widget.initAutocomplete(element_autocomplete);
         //$(this.container).find('.columns-wrapper').hide();
+        
         notifyUser("DEBUG: setting up removing query:" + $(this).closest('.query_wrapper').attr('id'));
-        $(this.container).children('.query_header').find('.cmd_del').live('click',  function(event) {
+        $(this.container).children('.query_header').find('.cmd_del').click(function(event) {
                 notifyUser("DEBUG: removing query:" + $(this).closest('.query_wrapper').attr('id'));
                 queryset.removequery($(this).closest('.query_wrapper').attr('id'));
@@ -376 +377 @@
          if (type=="fullpage")  {
                 //var jsonq = {"squerystring":this.squery, "querystring":this.query, "searchclauses":"null" , "collections" : this.json_coll, "columns" : this.json_cols};
-                //uri = "?query=" + JSON.stringify(jsonq) + "&startRecord=" + this.startRecord + "&maximumRecords=" + this.maximumRecords;
+                //uri = "?query=" + JSON.stringify(jsonq) + "&startItem=" + this.startItem + "&maximumItems=" + this.maximumItems;
                  //uri = this.query_json();
                  uri = link('base',this.query_uri());
@@ -402 +403 @@
                 var jsonq = {"squerystring":this.squery, "querystring":this.query, "searchclauses":"null" , "collections" : this.json_coll, "columns" : this.json_cols};
 
-                var uri = "?query=" + JSON.stringify(jsonq) + "&startRecord=" + this.startRecord + "&maximumRecords=" + this.maximumRecords;
+                var uri = "?query=" + JSON.stringify(jsonq) + "&startItem=" + this.startItem + "&maximumItems=" + this.maximumItems;
                 return uri;
 };
@@ -675 +676 @@
                 
                 query.repository = parseInt(getSelectedRepository());
-                query.startRecord = $('#' + qid ).find('.start_record').val();
-                query.maximumRecords = $('#' + qid ).find('.maximum_records').val();
+                query.startItem = $('#' + qid ).find('.start_record').val();
+                query.maximumItems = $('#' + qid ).find('.maximum_records').val();
                 query.resubmit();
 
@@ -692 +693 @@
                 var max_value = $('#' + qid ).find('.result-header').attr("max_value");
                 
-                if (parseInt(query.startRecord) + pages * page_record_count >= 1){
-                        start = parseInt(query.startRecord) + pages * page_record_count ;
-                } else if (parseInt(query.startRecord) + pages * page_record_count + page_record_count - 1 >= 1){
+                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) {
@@ -704 +704 @@
                                 num = max_value - start;
                         }
-                        
+                
                         if (num > 0){
-                                query.startRecord =     start;
-                                query.maximumRecords = num;
+                                query.startItem =       start;
+                                query.maximumItems = num;
                                 query.resubmit();
                         }
                 }
                 
-                //$('#' + qid ).find('.start_record').val(query.startRecord);
-                //$('#' + qid ).find('.maximum_records').val(query.maximumRecords);
+                //$('#' + qid ).find('.start_record').val(query.startItem);
+                //$('#' + qid ).find('.maximum_records').val(query.maximumItems);
                 //var max_results = 
                 
@@ -727 +727 @@
 
 
-$('.cmd_del').live('click',function(){
+$('.cmd_del').click(function(){
+        
         if ($(this).parent().parent().attr("class") == "query-columnslist"){
                 var list = $(this).closest('.query-columns').children('.query-columnslist');