nearly done

1 files changed, 23 insertions, 12 deletions

diff --git a/core/views/cave_kataster.py b/core/views/cave_kataster.py
index 692890e..cbfe3b3 100644
--- a/core/views/cave_kataster.py
+++ b/core/views/cave_kataster.py
@@ -43,23 +43,33 @@ def kataster(request, slug):
         

         global cavefilename, cave_data, entrance_data, loser_name, loser_data

         

-        mvscript = f"cd {settings.CAVEDESCRIPTIONS }\n"

+        mvscript = ""

+

+        ent_dir = settings.ENTRANCEDESCRIPTIONS # settings.EXPOWEB / "entrance_data"

+        mvscript += f"cd {settings.ENTRANCEDESCRIPTIONS }\n"

+        entrance_data = []

+        # entrance_ids =[]

+        for ent in ent_dir.iterdir():

+            if str(ent.name).startswith(str(cave)):

+                print(ent.name)

+                entrance_data.append("entrance_data/"+ent.name) 

+                # entrance_ids.append(ent.name.replace(".html",""))                

+                mvscript += f"mv {ent.name} {ent.name.replace(str(cave.unofficial_number),str(knum))}\n"

+ 

+        mvscript += f"\ncd {settings.CAVEDESCRIPTIONS }\n"

         cavefilename = str(cave) + ".html"

         target= f"{cave.areacode}-{str(knum)}"

         

         cave_data = Path( "cave_data", cavefilename  )

         if not (settings.CAVEDESCRIPTIONS / cavefilename).is_file: # settings.EXPOWEB / cave_data

             cave_data = "does not exist"

+            

+        mvscript += f'sed -i "/<kataster_number>/s/<kataster_number>/<kataster_number>{knum}/" {cavefilename}\n'        

+        mvscript += f'sed -i "/<survex_file>/s/<survex_file>[^<]*/<survex_file>caves-{cave.areacode}\/{knum}\/{knum}.svx/" {cavefilename}\n'        

+        mvscript += f'sed -i "/<entranceslug>/s/<entranceslug>{str(cave)}/<entranceslug>{cave.areacode}-{knum}/" {cavefilename}\n'        

+

         mvscript += f"mv {cavefilename} {target}.html\n"

 

-        ent_dir = settings.ENTRANCEDESCRIPTIONS # settings.EXPOWEB / "entrance_data"

-        mvscript += f"\ncd {settings.ENTRANCEDESCRIPTIONS }\n"

-        entrance_data = []

-        for ent in ent_dir.iterdir():

-            if str(ent.name).startswith(str(cave)):

-                print(ent.name)

-                entrance_data.append("entrance_data/"+ent.name)    

-                mvscript += f"mv {ent.name} {ent.name.replace(str(cave.unofficial_number),str(knum))}\n"

         loser_data = []

         loser_dir, loser_name = get_loser_dir(cave)

         if (loser_dir).is_dir():

@@ -134,9 +144,10 @@ def kataster(request, slug):
 

     # Restart script with POST data

     script = "# Conversion script - VERY INCOMPLETE AS YET\n# When doing it by hand, it is less error-prone to do the file re-namings last,\n"

-    script += "# but in a script it does not matter so much so long as everything is consistent and tested.\n"

+    script += "# after the edits, but in a script it does not matter so much\n"

+    script += "# so long as everything is consistent and tested.\n"

     script += "# Except that reversing changes using git does not always restore directories exactly\n# (because of .gitignore).\n\n"

-    script += "# Be careful with the directory names, they might not be the same on your PC as on the server\n\n"

+    script += "# Be careful with the directory names, they will usually NOT be the same on your PC as on the server\n\n"

     

     warning =""

 

@@ -158,7 +169,7 @@ def kataster(request, slug):
     

     

     script += f'\necho "{alias}" >> {aliasfile}'

-    script_rows =  str(min(35,3+script.count('\n')))   

+    script_rows =  str(max(35,3+script.count('\n')))   

     return render(

         request,

         "cave_kataster.html",