Skip to content

Commit 1314f3f

Browse files
Merge branch 'main' of https://github.com/INGV/shakemap-input-eu into main
2 parents 36e615f + 51210e1 commit 1314f3f

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

data/202010/20201030_0000059/current/20201030_0000059_A_RRSM_dat.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<stationlist created="" xmlns="ch.ethz.sed.shakemap.usgs.xml">
44
<station code="KARO" name="KARO" netid="KO" insttype="120s," lat="39.3089" lon="41.0493">
55
<comp name="--.HHN">
6-
<acc value="0.99999999" flag="0"/>
6+
<acc value="0.1403751570" flag="0"/>
77
<vel value="0.0515852502" flag="0"/>
88
<psa03 value="0.3252930250" flag="0"/>
99
<psa10 value="0.0320864155" flag="0"/>

data/202010/20201030_0000082/current/20201030_0000082_B_ESM_dat.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<stationlist created="1643112024">
1+
<stationlist created="1644479937">
22
<station code="KTHA" name="KTHA" netid="GE" source="GEOFON" insttype="" lat="36.2566" lon="23.0621">
33
<comp name=".HNE" depth="0.0">
44
<acc value="0.144149358" flag="0"/>

shakedata.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,14 +259,14 @@ def diff(xmlstring, xml_file):
259259
f.write(xmlstring)
260260
path = f.name
261261
f.close()
262-
diff = main.diff_files(path, xml_file )
262+
diff = main.diff_files(path, xml_file, {'ratio_mode': 'faster', 'fast_match': True} )
263263
os.unlink(path)
264264

265265
if len(diff) == 0:
266-
return True
266+
return False
267267
if len(diff) == 1 and diff[0].name == 'created':
268-
return True
269-
return False
268+
return False
269+
return True
270270

271271
'''
272272
def diff_old(mode, xmlstring, xml_file):
@@ -387,7 +387,7 @@ def git_push():
387387
# repo.git.add('data')
388388
# logger.info(f"Executing commit")
389389
# repo.index.commit("Some XML data updated")
390-
origin = repo.remote(name='origin')
390+
origin = repo.remote(name='origin_ssh')
391391
logger.info(f"Executing push to {args.git_repo_dir}")
392392
origin.push()
393393

@@ -459,7 +459,6 @@ def generate_event_xml_data(event_id):
459459
data = DownloadData(url_RRSM_dat)
460460
if data:
461461
saveIfChanged(data, FILE_FULL_NAME_DAT, event_id)
462-
463462
else:
464463
logger.warning(f"file {FILE_NAME_DAT} skipped because modified by the external user: {author}".expandtabs(TAB_SIZE))
465464

test_file

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)