Strip baked-in underscore prefix

mediachain · Jan 11, 2017 · 1de1e4a · 1de1e4a
1 parent 0b2f14b
commit 1de1e4a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/scripts/publish-500px.sh b/scripts/publish-500px.sh
@@ -12,7 +12,7 @@ SKIP_VALIDATION='--skipSchemaValidation'
 mcclient publish ${SKIP_VALIDATION} \
     --jqFilter '._source | del(.aesthetics)' \
     --prefix '500px'
-    --idFilter '.native_id' \
+    --idFilter '.native_id | sub("500px[^_]*_(?<id>\\d+)"; "\(.id)")' \
     ${NAMESPACE} \
     ${SCHEMA_HASH} \
     $1 > /dev/null

diff --git a/scripts/publish-dpla.sh b/scripts/publish-dpla.sh
@@ -12,7 +12,7 @@ SKIP_VALIDATION='--skipSchemaValidation'
 
 mcclient publish ${SKIP_VALIDATION} \
     --jqFilter '._source | del(.aesthetics)' \
-    --idFilter '.native_id | sub("dpla_http://dp.la/api/items/(?<id>.+)"; ".id")' \
+    --idFilter '.native_id | sub("dpla_http://dp.la/api/items/(?<id>.+)"; "\(.id)")' \
     --prefix 'dpla'
     ${NAMESPACE} \
     ${SCHEMA_HASH} \

diff --git a/scripts/publish-flickr-c10.sh b/scripts/publish-flickr-c10.sh
@@ -7,7 +7,7 @@ COMPOUND="--compound 10"
 mcclient publish ${COMPOUND} \
     --skipSchemaValidation \
     --jqFilter '._source | del(.aesthetics)' \
-    --idFilter '.native_id' \
+    --idFilter '.native_id | sub("flickr[^_]*_(?<id>\\d+)"; "\(.id)")' \
     --prefix 'flickr'
     ${NAMESPACE} \
     ${SCHEMA_HASH} \

diff --git a/scripts/publish-flickr-c100.sh b/scripts/publish-flickr-c100.sh
@@ -7,7 +7,7 @@ COMPOUND="--compound 100"
 mcclient publish ${COMPOUND} \
     --skipSchemaValidation \
     --jqFilter '._source | del(.aesthetics)' \
-    --idFilter '.native_id' \
+    --idFilter '.native_id | sub("flickr[^_]*_(?<id>\\d+)"; "\(.id)")' \
     --prefix 'flickr'
     ${NAMESPACE} \
     ${SCHEMA_HASH} \

diff --git a/scripts/publish-flickr.sh b/scripts/publish-flickr.sh
@@ -12,7 +12,7 @@ SKIP_VALIDATION='--skipSchemaValidation'
 
 mcclient publish ${SKIP_VALIDATION} \
     --jqFilter '._source | del(.aesthetics)' \
-    --idFilter '.native_id' \
+    --idFilter '.native_id | sub("flickr[^_]*_(?<id>\\d+)"; "\(.id)")' \
     --prefix 'flickr'
     ${NAMESPACE} \
     ${SCHEMA_HASH} \

diff --git a/scripts/publish-pexels.sh b/scripts/publish-pexels.sh
@@ -11,8 +11,8 @@ SKIP_VALIDATION='--skipSchemaValidation'
 
 mcclient publish ${SKIP_VALIDATION} \
     --jqFilter '._source | del(.aesthetics)' \
-    --idFilter '.native_id' \
-    --prefix 'flickr'
+    --idFilter '.native_id | sub("flickr[^_]*_(?<id>\\d+)"; "\(.id)")' \
+    --prefix 'pexels'
     ${NAMESPACE} \
     ${SCHEMA_HASH} \
     $1 > /dev/null