Refine

auto_cache.py

@@ -6,14 +6,11 @@ import redis
 import urllib.request
 
 def queryallrecordsbydatewithtype(date: str):
-<<<<<<< HEAD
-=======
 
->>>>>>> 0132ae1a7963c6f6b2504e8d0a22f0023b9296e8
     print(f'queryallrecordsbydatewithtype: {date}')
 
     try:
-        response = urllib.request.urlopen(f'http://localhost/{method_name}/?querydate={date}&querytype=node')
+        response = urllib.request.urlopen(f'http://localhost/queryallrecordsbydatewithtype/?querydate={date}&querytype=node')
         html = response.read().decode('utf-8')
         #print(html)
 
@@ -24,10 +21,7 @@ def queryallrecordsbydatewithtype(date: str):
         print("Error")
 
 def queryallrecordsbydateproperty(date: str):
-<<<<<<< HEAD
-=======
 
->>>>>>> 0132ae1a7963c6f6b2504e8d0a22f0023b9296e8
     print(f'queryallrecordsbydateproperty: {date}')
 
     try:
@@ -43,10 +37,7 @@ def queryallrecordsbydateproperty(date: str):
         print("Error")
 
 def queryallscadarecordsbydate(date: str):
-<<<<<<< HEAD
-=======
 
->>>>>>> 0132ae1a7963c6f6b2504e8d0a22f0023b9296e8
     print(f'queryallscadarecordsbydate: {date}')
 
     try:
@@ -57,10 +48,7 @@ def queryallscadarecordsbydate(date: str):
         print("Error")
 
 def queryallschemeallrecords(date: str):
-<<<<<<< HEAD
-=======
 
->>>>>>> 0132ae1a7963c6f6b2504e8d0a22f0023b9296e8
     print(f'queryallschemeallrecords: {date}')
 
     try: