Changeset 1260 for MDService2/trunk/MDService2/WebContent

Timestamp:

04/28/11 22:25:00 (13 years ago)

Author:

gaba

Message:

info-detail, samplequeries

Location:

MDService2/trunk/MDService2/WebContent

Files:

• scripts/mdservice_helpers.js (modified) (2 diffs)
• scripts/mdservice_ui.js (modified) (1 diff)
• scripts/mdservice_ui_detail.js (modified) (1 diff)
• scripts/mdservice_ui_load.js (modified) (2 diffs)
• static/queries.xml (modified) (3 diffs)

MDService2/trunk/MDService2/WebContent/scripts/mdservice_helpers.js

@@ -8 +8 @@
 // url params reading
 var params;
-function getUrlVars()
+function getUrlVars(url)
 {
+        if (url == undefined){
+                url = window.location.href;
+        }
     var vars = [], hash;
-    var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+    var hashes = url.slice(url.indexOf('?') + 1).split('&');
     for(var i = 0; i < hashes.length; i++)
     {
@@ -19 +22 @@
     }
     return vars;
-}
-
+    //return getUrlVars(window.location.href);
+};
 
 

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui.js

@@ -159 +159 @@
         });
 
+        $('.detail-content a').live('click',  function(event) {
+                
+                event.preventDefault();         
+                var uri = $(this).attr('href'); // + " body";
+                if (uri.indexOf("?") > 0) { //($(this).attr("target") == "query"){
+                        var urlparams = getUrlVars(uri);
+                        loadQueryFromUriParams(urlparams);
+                } else {
+                        var type = $(this).parents('.detail-wrapper').attr("id");
+                        type = type.substring(7,type.length);
+                //      $.get(uri, showDetail,'html'); */
+                        detailcaller.calldetail(undefined, type, uri);
+                }
+        });
         $('.result a.external, .mdrecord-detail a.external').live('click',  function(event) {
                 

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_detail.js

@@ -71 +71 @@
                 this.content = undefined;
                 if (this.detailwidget == undefined){
-                        this.url = '/MDService2/docs/xml/welcome #welcome';
+                        if (this.url == undefined) {
+                                this.url = '/MDService2/docs/xml/welcome #welcome';
+                        }
+                        if (this.url == null) {
+                                this.url = '/MDService2/docs/xml/welcome #welcome';
+                        }
+
                 } else {
                         //var a = $(this).parent().next().attr('id');

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_load.js

@@ -432 +432 @@
 }
 
-function loadQueryFromUriParams(){
-        
-        var q = url_params["q"];
-        var squery = url_params["squery"];
-        var collection = url_params["collection"];
-        var startItem = url_params["startItem"];
-        var maximumItems = url_params["maximumItems"];
-        var repository = url_params["repository"];
-        var columns = url_params["columns"];
+function loadQueryFromUriParams(local_uri){
+        var url;
+        
+        if (local_uri == undefined){
+                url = url_params;
+        } else {
+                url = local_uri;
+        }
+        var q = url["q"];
+        var squery = url["squery"];
+        var collection = url["collection"];
+        var startItem = url["startItem"];
+        var maximumItems = url["maximumItems"];
+        var repository = url["repository"];
+        var columns = url["columns"];
         if ((q != undefined) || (squery != undefined) || (collection != undefined)) {
                 if (q == undefined) {
@@ -460 +466 @@
                 }
                 if (repository == undefined) {
-                        repository = 1;
+                        repository = getSelectedRepository();
                 }
                 if (collection == undefined){

MDService2/trunk/MDService2/WebContent/static/queries.xml

@@ -6 +6 @@
                         <dd><p>just one word like:</p>
                                 <ul>            
-                                        <li><a href="/MDService2/?squery=system">system</a></li>
-                                        <li><a href="/MDService2/?squery=-year-olds">-year-olds</a> - a bug there (don't use '-'!)</li>
-                                        <li><a href="/MDService2/?squery=acquisition">acquisition</a></li>                      
+                                        <li><a target="query" href="/MDService2/?squery=system">system</a></li>
+                                        <li><a class="query" href="/MDService2/?squery=-year-olds">-year-olds</a> - a bug there (don't use '-'!)</li>
+                                        <li><a class="query" href="/MDService2/?squery=acquisition">acquisition</a></li>                        
                                 </ul>
                         </dd>
@@ -14 +14 @@
                         <dd>
                                 <ul>
-                                        <li><a href="/MDService2/?squery=/?squery=child%20%7C%20acquisition">child | acquisition</a></li>
+                                        <li><a class="query" href="/MDService2/?squery=/?squery=child%20%7C%20acquisition">child | acquisition</a></li>
                                 </ul>
                         </dd>
@@ -20 +20 @@
                         <dd>
                                 <ul>
-                                        <li><a href="/MDService2/?squery=child%20acquisition">child acquisition</a></li>
-                                        <li><a href="/MDService2/?squery=longitudinal%20study">longitudinal study</a></li>                      
+                                        <li><a class="query" href="/MDService2/?squery=child%20acquisition">child acquisition</a></li>
+                                        <li><a class="query" href="/MDService2/?squery=longitudinal%20study">longitudinal study</a></li>                        
                                 </ul>
                         </dd>