Changeset 29423 for main/trunk/model-sites-dev/von-sparql/js/von-sparql-comparison-setup.js

Timestamp:

2014-11-12T14:54:33+13:00 (9 years ago)

Author:

ak19

Message:

Changes made to some functions that were deleted in new version of jquery

File:

• main/trunk/model-sites-dev/von-sparql/js/von-sparql-comparison-setup.js (modified) (7 diffs)

main/trunk/model-sites-dev/von-sparql/js/von-sparql-comparison-setup.js

@@ +1 @@
+///////////////////////////////////////////////
+//                                           //
+//         Setup for comparisons             //
+// Query generation code is messy, watch out!//
+//                                           //
+///////////////////////////////////////////////
+
+//SPARQL endpoint location
 var sparqlEndpoint= location.protocol + '//' + location.hostname + ":3030/greenstone/query" ;
-var collectionName = gs.cgiParams.c;
-
+//Contains the query built
 var comparisonQuery;
+//Hard limit for results returned from a query
 var hardLimit = 2000;
+//sgvizler chart width/height
 var defaultChartWidth = 468;
 var defaultChartHeight = 200;
+//just to keep track of amount of queries running
 var currentQueries = 0;
 
-var leftCollection = "nz-natlib-cat";
-var rightCollection = "hathitrust-tab";
-
-//Contains details about a comparison
+//collection names
+var leftCollection = "";
+var rightCollection = "";
+
+// ComparisonQuery object contains details about a comparison to be made between 2 datasets
+// page         Page number
+// datsetSelection  Left or right dataset
+// pred_L       Left predicate
+// predval_L        Left predicate value (if restricting to a specific value)
+// refine_L     Left predicate to use for comparison after restriction
+// pred_R       Right predicate
+// predval_R        Right predicate value (if restricting to a specific value)
+// refine_R     Right predicate to use for comparison after restriction
 function ComparisonQuery(){
     this.page = 1;
@@ -20 +39 @@
     this.refine_L = "";
     if($('#cb_leftRefineSearch').is(':checked'))
-        this.refine_L = "  <" + $('#sel_leftVisualizePredicate').val();// + "> ?common";
+        this.refine_L = "  <" + $('#sel_leftVisualizePredicate').val() + "> ";// + "> ?common";
 
     this.pred_R = $('#sel_rightPredicate').val();
@@ -26 +45 @@
     this.refine_R = "";
     if($('#cb_rightRefineSearch').is(':checked'))
-        this.refine_R = "  <" + $('#sel_rightVisualizePredicate').val();// + "> ?common";
+        this.refine_R = "  <" + $('#sel_rightVisualizePredicate').val() + "> ";// + "> ?common";
     $('#span_PageNum').text("1");   
 }
@@ -32 +51 @@
 function setupPage(){ 
     sgvizler_setup();
+    //Load collection names from dropdown boxes
+    leftCollection = $('#sel_leftCollection').val();
+    rightCollection = $('#sel_rightCollection').val();
+    
+    //Draw buttons, etc for each side of page
     drawSide("left",leftCollection);
     apply_functions("left",leftCollection);
     drawSide("right",rightCollection);
     apply_functions("right",rightCollection);
+    
+    //apply css to generated objects
     apply_styles();
+
+    //populates predicate dropdown boxes
     populatePredicateSelector("all", "sel_comparisonPredicate");
 }
@@ -156 +184 @@
 
     //When a <tr> in overview table is selected, select in predicate dropdown
-    $('#div_' + side + 'Overview.overview tr').live("click", function(){
+$(document).on("click", "#div_" + side + "Overview.overview tr", function(){
         var clickedText = tidyPredicate($(this).children(":first").text());
         $('#sel_' + side + 'Predicate option[text="' + clickedText + '"]').attr('selected','selected');
@@ -176 +204 @@
 
     $('#cb_' + side + 'RefineSearch').on('click', function(){
-        $('#table_' + side + 'RefineControls').toggle();    
+        //$('#table_' + side + 'RefineControls').toggle();  
+        $('#table_' + side + 'RefineControls').toggle("slide", { direction: "up" });
     });
 
@@ -188 +217 @@
     });
 }
+
+// When a predicate is clicked on one side, makes the same predicate on 
+// the opposite side bold, to stand out
 function showSimilarPredicates(side,clickedText){
-
     var oppositeSide;
     if(side == "left")