Merge branch 'master' into region

api/batch_cmds.py

@@ -323,7 +323,7 @@ def execute_batch_command(name: str, cs: ChangeSet) -> ChangeSet:
             elif operation == API_DELETE:
                 result.merge(execute_delete_command(name, ChangeSet(op)))
     except:
-        print(f'ERROR: Fail to execute {todo}!')
+        print(f'ERROR: Fail to execute {todo}')
 
     count = read(name, 'select count(*) as count from batch_operation')['count']
     if count == 1:

api/s2_junctions.py

@@ -150,8 +150,8 @@ def inp_in_junction(line: str, demand_outside: bool) -> str:
 
     id = str(tokens[0])
     elevation = float(tokens[1])
-    demand = float(tokens[2]) if num_without_desc >= 3 else None
-    pattern = str(tokens[3]) if num_without_desc >= 4 else None
+    demand = float(tokens[2]) if num_without_desc >= 3 and tokens[2] != '*' else None
+    pattern = str(tokens[3]) if num_without_desc >= 4 and tokens[3] != '*' else None
     pattern = f"'{pattern}'" if pattern != None else 'null'
     desc = str(tokens[-1]) if has_desc else None