Changeset 1664 for MDService2

Timestamp:

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

Author:

gaba

Message:

index autocomplete

Location:

MDService2/branches/MDService_simple3

Files:

• WebContent/scripts/mdservice_searchclause.js (modified) (8 diffs)
• WebContent/scripts/mdservice_ui_load.js (modified) (4 diffs)
• WebContent/scripts/mdservice_ui_settings.js (modified) (1 diff)
• src/xsl/html_snippets.xsl (modified) (1 diff)

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

@@ -60 +60 @@
         return $($($('.sc-i','#searchclauselist')[this.i]).find('.sc-j')[this.j]).find('.index_select');
 };
+SearchClause.prototype.GetIndexInputTermset = function(){
+        return $($($('.sc-i','#searchclauselist')[this.i]).find('.sc-j')[this.j]).find('.index-input-termset');
+};
+SearchClause.prototype.GetIndexInput = function(){
+        return $($($('.sc-i','#searchclauselist')[this.i]).find('.sc-j')[this.j]).find('.index-input');
+};
 
 
@@ -75 +81 @@
         //}
         var x = "<div id='" + this.j + "' class='sc-j or_level' ><div id='" + this.listid + "' class='sc-wrapper focused' > " +
-        "<div class='search'><span class='index-search'><select class='index_select'/><input type='text' class='index-input autocomplete-input' /></span>" + 
+        "<div class='search'><span class='index-search'><select class='index_select'/><input type='text' class='index-input-termset autocomplete-input' /><input type='text' class='index-input autocomplete-input' /></span>" + 
         //index_detail +
         //"<select type='text' class='rel_input' />" +
@@ -92 +98 @@
         var e_value = this.GetValueInput();
         var index_select = this.GetIndexSelect();
+        //var index_input_termset = this.GetIndexInputTermset();
         var value_select = this.GetValueSelect();
         
         $(index_select).hide();
+        //$(index_input_term).hide();
+        this.GetIndexInput().hide();
         value_select.hide();
         //$(e_index).closest('.sc-wrapper').find('.index-context').hide();
@@ -207 +216 @@
                 notifyUser("autocomplete failed: " + e.message);
         }
-
-
-        /*
-         e_value.autocompleteArray(value_autocomplete,{
-                                autoFill:true,
-                                width:90
-        });
-         */
-        
         
  };
@@ -223 +223 @@
          if (element_autocomplete.length == 0) return;
           
-         //autocomplete
-                function handleTermsSelection(i,j,elem){
-                        
-                        var context = $('#' + 'sc' +  i + '-' + j).find('.index-context');
-                        // fill context
-                        //$(context).remove();
-                        $(context).html(elements_hashtable[elem]);
-                        
-                        /*
-                        $(context).children('table').children().remove();
-                        for(var ii=0;ii< elements_hashtable[elem].length;ii++){
-                                var row = '<tr><td>' + elements_hashtable[elem][ii] + '</td></tr>';
-                                $(context).children('table').append(row);
-                        }
-                        */
-                        
-                        $(context).show();
-                        //notifyUser($('#' + 'sc' +  i + '-' + j).find('.index-input').val(), 'debug');
-                        //$('#' + 'sc' +  i + '-' + j).find('.index-input').focus();
-                        
-                        $('#' + 'sc' +  i + '-' + j).find('.index-input').blur(function(){
-                                $(context).hide();
-                        });
-                        $('#' + 'sc' +  i + '-' + j).find('.index-input').focusin(function(){
-                                $(context).hide();
-                        });
-                        
-                        
-                                        /*
-                        var t = '<div><table><tr><td><a href="">aaaa<a></td></tr><tr><td><a href="">bbbb<a></td></tr><table></div>';
-                        var x = '<div class="index_context"><table></table></div>';
-                        $('.focused','#searchclauselist').find('.index_search').append(x);
-
-                        
-                        for(var i=0;i< elements_hashtable[elem].length;i++){
-                                var li = '<span><a href="">' + elements_hashtable[elem][i] + '</a></span>';
-                                $('.focused','#searchclauselist').find('.index_context').append(li);
-                        }*/
-                        
-                        //$('.focused','#searchclauselist').find('.index-input').hide();
-                        
-                };
-                
-                //autocomplete
-                function findValue(e) {
-                        //if( li == null ) return alert("No match!");
-                 
-                        var sValue = e.selectValue;
-                        
-                        var i = $('.focused','#searchclauselist').closest('.sc-i').attr("id");
-                        var j = $('.focused','#searchclauselist').closest('.sc-j').attr("id");
-                        //alert(i+ ',' + j + sValue);
-                        searchclauseset.searchclauses[i][j].index = sValue;
-                        
-                        handleTermsSelection(i,j,sValue);               
-                        
-                        //$('.focused','#searchclauselist').find('.value-input').focus();
-                        
-                }
-                 
-                function selectItem(li) {
-                        findValue(li);
-                }
-
-                $(this.GetIndexInput()).autocompleteArray(element_autocomplete,{
+                $(this.GetIndexInputTermset()).autocompleteArray(element_autocomplete,{
                         autoFill:true,
                         //width:150,
-                        onFindValue:findValue,
-                        onItemSelect:selectItem
+                        onFindValue:findValueTermset,
+                        onItemSelect:selectItemTermset
                 });
 
@@ -297 +233 @@
          
  };
+
 
 SearchClause.prototype.CreateSelect = function(str, element){
@@ -502 +439 @@
                         searchclauseset.searchclauses[i][j].value = "";
                         $('#sc0-0').find('.index-input').val("");
+                        $('#sc0-0').find('.index-input-termset').val("");
                         $('#sc0-0').find('.rel_input').val("=");
                         $('#sc0-0').find('.value-input').val("");                       
@@ -711 +649 @@
 }
 
+
+
+//autocomplete
+// not used
+function handleTermsSelection(i,j,elem){
+                        /*
+                        var context = $('#' + 'sc' +  i + '-' + j).find('.index-context');
+                        // fill context
+                        //$(context).remove();
+                        $(context).html(elements_hashtable[elem]);
+                        $(context).show();
+                        //notifyUser($('#' + 'sc' +  i + '-' + j).find('.index-input').val(), 'debug');
+                        //$('#' + 'sc' +  i + '-' + j).find('.index-input').focus();
+                        
+                        $('#' + 'sc' +  i + '-' + j).find('.index-input').blur(function(){
+                                $(context).hide();
+                        });
+                        $('#' + 'sc' +  i + '-' + j).find('.index-input').focusin(function(){
+                                $(context).hide();
+                        });
+                        */
+                        //$('#' + 'sc' +  i + '-' + j).find('.index-input').hide();
+                        //$('#' + 'sc' +  i + '-' + j).find('.index-input-termset').show();
+                        
+};
+                
+function findValueTerm(e) {
+                        
+                        var sValue = e.selectValue;
+                        
+                        var i = $('.focused','#searchclauselist').closest('.sc-i').attr("id");
+                        var j = $('.focused','#searchclauselist').closest('.sc-j').attr("id");
+                        //alert(i+ ',' + j + sValue);
+                        searchclauseset.searchclauses[i][j].index = sValue;
+                        
+                        //handleTermsSelection(i,j,sValue);             
+                        
+}
+                 
+function selectItemTerm(li) {
+                        findValueTerm(li);
+                }
+
+
+function initTermsetAutocomplete(i,j,elem){
+        //$('#' + 'sc' +  i + '-' + j).find('.index-input').hide();
+        
+        // not working
+        //searchclauseset.searchclauses[i][j].initAutocompleteTerms(elem);
+
+        $('#' + 'sc' +  i + '-' + j).find('.index-input').autocompleteArray(elements_hashtable[elem],{
+                autoFill:true,
+                //width:150,
+                onFindValue:findValueTerm,
+                onItemSelect:selectItemTerm
+        });
+        // reset the index value
+        $('#' + 'sc' +  i + '-' + j).find('.index-input').val("");
+        searchclauseset.searchclauses[i][j].index = "";
+        $('#' + 'sc' +  i + '-' + j).find('.index-input').show();
+        $('body').find('.ac_results').css({'z-index' : '1000'});
+        
+};
+
+function handleTermsetSelection(i,j,elem){
+        
+        // create apropriate array, than initialize autocomplete
+        if ($('#elements_hashtable_'+elem).children().length == 0) {
+                $('#elements_hashtable_'+elem).load(link('smc','list/?context='+elem),function(){
+                        //var e = $(this).attr("id");
+                        $(this).find('Term').each(function(index){
+                                elements_hashtable[elem][index] = $(this).text();
+                        });
+                        initTermsetAutocomplete(i,j,elem);
+                });
+        } else {
+                initTermsetAutocomplete(i,j,elem);
+        }       
+};
+
+function findValueTermset(e) {
+        var sValue = e.selectValue;
+        
+        var i = $('.focused','#searchclauselist').closest('.sc-i').attr("id");
+        var j = $('.focused','#searchclauselist').closest('.sc-j').attr("id");
+        
+        //searchclauseset.searchclauses[i][j].index = sValue;   
+        handleTermsetSelection(i,j,sValue);             
+        
+        $('.focused','#searchclauselist').find('.index-input').focus();
+        
+}
+ 
+function selectItemTermset(li) {
+        findValueTermset(li);
+}

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

@@ -65 +65 @@
                                 loadCollections(true);                          
                                 loadTerms();
-                                loadTermsAutocomplete();
+                                //loadTermsAutocomplete();
                                 loadQueryFromUriParams();
                                 createTooltip(null);
@@ -76 +76 @@
                                                         loadBookmarksets();
                                                         createTooltip(this);
+                                                        loadTermsAutocomplete();
                                 });
                                 
@@ -242 +243 @@
         
         var elem;
+        $('#termset_autocomplete').children().remove();
+        $('#termset_autocomplete').css('display','none');
         $('#terms_autocomplete').children().remove();
         $('#terms_autocomplete').css('display','none');
-        $('#terms_autocomplete').load(link('terms_autocomplete','autocomplete/?q=all&repository='+ getSelectedRepository()),function(){
-                $(this).find('term').each(function(index){
-                        elem = $(this).attr("name");
-                        element_autocomplete[index] = elem;
-                        elements_hashtable[elem] = $(this).html();
+        $('#termset_autocomplete').load(link('smc','list/?context=*'),function(){
+                $(this).find('Termset').each(function(index){
+                        elem = $(this).children("key").text();
+                        element_autocomplete[index] = elem;     
+                        // create div for each element 
+                        elements_hashtable[elem] = new Array();//$(this).html()
+                        $('#terms_autocomplete').append($('<div/>').attr("id","elements_hashtable_" + elem));
                 });
                 // add autocomplete 's
@@ -687 +692 @@
         Workspace.save("USER");
         */
-}
+};
 
 /*

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

@@ -65 +65 @@
                 pazpar: {
                                         base_uri: "/MDService2/pazpar2/"
-                                 }
+                                 },
+                smc: {
+                                        base_uri: "/MDService2/smc/"
+                                }        
 
         };

MDService2/branches/MDService_simple3/src/xsl/html_snippets.xsl

@@ -137 +137 @@
                 </form>
                 </div>
+                <div id="termset_autocomplete" />
+                <div id="terms_autocomplete" />
         </div>