Changeset 35903

Timestamp:

2022-01-07T20:24:04+13:00 (2 years ago)

Author:

davidb

Message:

Ignore the older excel file up to 2019

Location:

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/voting-excel

Files:

• . (modified) (1 prop)
• xlsx-tocountry-jsonmetadata.py (modified) (3 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/voting-excel/xlsx-tocountry-jsonmetadata.py

@@ -476 +476 @@
 
 
-def display_gs_head_metadata_tags():
-
-    print()
-    print()
-    print("For, e.g., '<display><format>' section of collectionConfig.xml:")
-    print()
-    print("  <gsf:headMetaTags>")
+def display_gs_head_metadata_tags(ofile=sys.stdout):
+
+    print("  To be placed verbatim inside of '<display><format>' section of collectionConfig.xml:")
+
+    print("", file=ofile)
+    print("  <!-- <gsf:headMetaTags> -->", file=ofile)
+    print("  <!-- Needed so voting metadata for doc page retreives for all the 'from-country' votes -->", file=ofile)
 
     for from_country in sorted(jury_from_countries.keys()):
-        print("    <gsf:metadata name=\""+from_country+"-J\" />")
-
-    print()
+        print("    <gsf:metadata name=\""+from_country+"-J\" />", file=ofile)
+
+    print("",file=ofile)
     for from_country in sorted(tele_from_countries.keys()):
-        print("    <gsf:metadata name=\""+from_country+"-T\" />")
-
-    print()
+        print("    <gsf:metadata name=\""+from_country+"-T\" />", file=ofile)
+
+    print("", file=ofile)
     for from_country in sorted(comb_from_countries.keys()):
-        print("    <gsf:metadata name=\""+from_country+"-C\" />")
-
-    print()
+        print("    <gsf:metadata name=\""+from_country+"-C\" />", file=ofile)
+
+    print("", file=ofile)
     for from_country in sorted(sing_from_countries.keys()):
-        print("    <gsf:metadata name=\""+from_country+"-S\" />")
-        
-    print("  </gsf:headMetaTags>")
+        print("    <gsf:metadata name=\""+from_country+"-S\" />", file=ofile)
+        
+    print("  <!-- </gsf:headMetaTags> -->", file=ofile)
 
     
@@ -508 +508 @@
     parser.add_argument('--votingtype', choices=['J','T'], help="Filter to only J=Jury or T=Tele cast votes")        
     parser.add_argument('input-file.xlsx')
-    parser.add_argument('output-file.json', nargs='?')
+    parser.add_argument('output-file.json')
+    parser.add_argument('gsf-headMetaTags.xml')
 
     
     args = parser.parse_args()
 
-    sheetname = getattr(args,'sheetname');
+    sheetname   = getattr(args,'sheetname');
     voting_type = getattr(args,'votingtype');
 
-    excel_input_filename = getattr(args,'input-file.xlsx');
-    json_output_filename = getattr(args,'output-file.json');
-    
+    excel_input_filename    = getattr(args,'input-file.xlsx');
+    json_output_filename    = getattr(args,'output-file.json');
+    gsf_hmt_output_filename = getattr(args,'gsf-headMetaTags.xml');
+
+        
     if (json_output_filename == None):
         json_output_filename = os.path.splitext(excel_input_filename)[0]+'.json'
@@ -563 +566 @@
     xlsxutil.save_greenstone_json_metadata(greenstone_metadata_json,json_output_filename)
 
-    display_gs_head_metadata_tags()
-    
     print()    
-
+    print("Saving <gsf:headMetaTags /> block as: " + gsf_hmt_output_filename)    
+
+    gsf_hmt_ofile = open(gsf_hmt_output_filename,"w")
+    display_gs_head_metadata_tags(gsf_hmt_ofile)
+    gsf_hmt_ofile.close()
+    
+    print()    
+