Fixed checkboxes not updating properly

Author: Ran4

src/server/search_template.html

@@ -9,8 +9,8 @@
 	Attribute values required: <input type="text" name="query_search_input1" 
 		class="textfield" value="{{default_query_value1}}" autofocus>
 	<input type="checkbox" name="in_search" value="1" {{in_search_checked}}>
-		Use "in" search<br>
-	<input type="checkbox" name="case_sensitive" value="1" {{in_search_checked}}>
+		Use "in" search
+	<input type="checkbox" name="case_sensitive" value="1" {{case_sensitive_checked}}>
 		Case sensitive<br>
 		<p style='color: #505050'>
 			(e.g. "nationality=british, occupation=actor")</p>

src/server/server.py

@@ -89,11 +89,8 @@ def serveImage(self, filename):
 
     def index(self):
         self.loadTemplates()
-        return template(self.template,
-            default_query_value="",
-            in_search_checked="",
-            imagetemplate="",
-            textresponse="")
+        
+        return self.submit_search_query()
 
     def submit_search_query(self):
         self.loadTemplates()
@@ -102,7 +99,8 @@ def getReturnTemplate(textResponse):
             return template(self.searchTemplate,
                 default_query_value1=userInput1 or "",
                 default_query_value2=userInput2 or "",
-                in_search_checked="checked",
+                in_search_checked="checked"*bool(inSearch),
+                case_sensitive_checked="checked"*bool(caseSensitive),
                 textresponse=textResponse).replace("&lt;","<").replace("&gt;",">").replace('&quot;','"').replace("&#039;",'"')
 
         userInput1 = request.GET.get("query_search_input1")
@@ -123,17 +121,16 @@ def getReturnTemplate(textResponse):
         requestedValuesKeys = []
         if userInput1:
             for req in map(lambda x: x.strip(), userInput1.split(",")):
-                if "=" not in req:
-                    resp = "Problems parsing required keys! "
-                    resp += "No '=' found in '%s'" % req
-                    return getReturnTemplate(resp)
                 if req.count("=") > 1:
                     resp = "Problems parsing required keys!  "
                     resp += "More than one '=' found in '%s'" % req
                     return getReturnTemplate(resp)
 
-                reqKey, reqValue = req.split("=")
-                requiredKeyValues.append((reqKey, reqValue))
+                if "=" in req:
+                    reqKey, reqValue = req.split("=")
+                    requiredKeyValues.append((reqKey, reqValue))
+                else:
+                    requiredKeyValues.append((req, ""))
 
         if userInput2:
             for outKey in map(lambda x: x.strip(), userInput2.split(",")):
@@ -144,6 +141,9 @@ def getReturnTemplate(textResponse):
                 return getReturnTemplate(resp)
 
         if requiredKeyValues and requestedValuesKeys:
+            #~ if "url" in requestedValuesKeys:
+                #~ requestedValuesKeys.replace
+            
             #perform search here
             if inSearch:
                 searchType = "in_search"
@@ -215,16 +215,13 @@ def getReturnTemplate(textResponse):
 
                     if key.lower() == "wikiurl": #remove http:/.../ part
                         shownValue = value.split("/")[-1].replace("_", " ")
-                        
-                        #~ value = "/".join(value.split("/")[:-1]) + \
-                            #~ "/" + value.split("/")[-1].capitalize()
-                            
 
                         url = "http://en.wikipedia.org/w/index.php?search=%s" %\
                             value.split("/")[-1].replace(" ", "%20")
 
                         value = "<a href=%s>%s</a>" % (url, shownValue)
                     else:
+                        #Don't show really long lines
                         characterLengthLimit = 90
                         if len(value) > characterLengthLimit:
                             value = value[:characterLengthLimit-3] + "..."

src/server/stylesheet.css

@@ -4,8 +4,7 @@ body {
 }
 
 p {
-	color: black;
-	
+	color: black;	
 }
 
 .textfield {
@@ -15,9 +14,11 @@ p {
 .table_even {
 	background-color: #BDD8F6;
 	color: #000000
+	border: 1px solid black;
 }
 
 .table_odd {
 	background-color: #BDD8F6;
 	color: #606060
+	border: 1px solid black;
 }

src/statistics.py

@@ -210,7 +210,7 @@ def doStatistics(self):
 
 
     def search(self, requiredKeyValues, requestedValuesKeys,
-            searchType=None):
+            searchType=None, caseSensitive=False):
         """ Returns a list of keyvalue-pairs from articles containing certain key-values
         requiredKeyValues: ((key, value))   # Note: uses "in_search searching"
         queryOut: (key)
@@ -225,16 +225,23 @@ def search(self, requiredKeyValues, requestedValuesKeys,
         results = []
         for pageDict in self.j:
             wasMatch = True
+            
             for key, value in requiredKeyValues:
-                if key not in pageDict or value not in pageDict[key]:
-                    wasMatch = False
+                if caseSensitive:
+                    if key not in pageDict or value not in pageDict[key]:
+                        wasMatch = False
+                else:
+                    if key not in pageDict or isinstance(pageDict[key], list):
+                        wasMatch = False
+                    else:
+                        pageDictValue = pageDict[key].lower()
+                    
+                        if value.lower() not in pageDictValue:
+                            wasMatch = False
 
             if not wasMatch:
                 continue
 
-            #print "\n"*3
-            #print "Found match with pageDict: %s" % str(pageDict)[:500]
-            
             r = []
             for requestedKey in requestedValuesKeys:
                 #print "requestedKey:", requestedKey