Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OSUG
RESIF
datadump
Commits
f9483fee
Commit
f9483fee
authored
Jul 18, 2019
by
Jonathan Schaeffer
Browse files
Bugfix
parent
c1f37542
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/resifdatadump
View file @
f9483fee
...
...
@@ -201,7 +201,7 @@ iput -f $LOCAL_REPORT $IRODS_REPORT
KEY
=
"validated-seismic-metadata"
if
[[
-r
$RECOVERY_FILE
]]
&&
egrep
-q
-e
".*(
$KEY
).*( OK | Skipped ).*"
$RECOVERY_FILE
;
then
format_report
$KEY
"-"
$(
date
+%Y-%m-%dT%H:%M:%S
--date
=
@
$start
)
"-"
"-"
"Skipped"
>>
$LOCAL_REPORT
format_report
$KEY
"-"
$(
date
+%Y-%m-%dT%H:%M:%S
)
"-"
"-"
"Skipped"
>>
$LOCAL_REPORT
else
# Get the snapshot name for this month
MONTH
=
$(
date
+%Y-%m
)
...
...
@@ -250,7 +250,7 @@ for dir in $(find . -maxdepth 3 -type d | sort); do
if
[[
-r
$RECOVERY_FILE
]]
;
then
if
egrep
-q
-e
".*
$YEAR
.*
$NETWORK
.*
$STATION
.*( OK | Skipped ).*"
$RECOVERY_FILE
;
then
echo
"[
$KEY
] Found OK or skipped in
${
RECOVERY_FILE
}
. Skipping"
format_report
$KEY
"-"
$(
date
+%Y-%m-%dT%H:%M:%S
--date
=
@
$start
)
"-"
"-"
"Skipped"
>>
$LOCAL_REPORT
format_report
$KEY
"-"
$(
date
+%Y-%m-%dT%H:%M:%S
)
"-"
"-"
"Skipped"
>>
$LOCAL_REPORT
continue
fi
fi
...
...
@@ -275,7 +275,7 @@ for dir in $(find . -maxdepth 3 -type d | sort); do
# If the hashes differs, then move distant file and push this one
if
[[
"
$local_sha
"
=
"
$irods_sha
"
]]
;
then
echo
"[
$KEY
] The archive on irods is the same as our version. Skipping."
format_report
$KEY
"-"
$(
date
+%Y-%m-%dT%H:%M:%S
--date
=
@
$start
)
"-"
"-"
"Skipped"
>>
$LOCAL_REPORT
format_report
$KEY
"-"
$(
date
+%Y-%m-%dT%H:%M:%S
)
"-"
"-"
"Skipped"
>>
$LOCAL_REPORT
continue
fi
fi
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment