Changeset 34459 for main/trunk/model-sites-dev/atea/collect

Timestamp:

2020-10-17T16:31:17+13:00 (4 years ago)

Author:

davidb

Message:

Now works with dnzkey.txt to separate out where the key is stored

Location:

main/trunk/model-sites-dev/atea/collect/digital-nz/prepare

Files:

• 01-PREP.sh (modified) (2 diffs)
• 02-RUN.sh (modified) (1 diff)
• dnz-search-language-mi--python3.py (modified) (1 diff)
• dnzkey.txt.in (added)

main/trunk/model-sites-dev/atea/collect/digital-nz/prepare/01-PREP.sh

@@ -22 +22 @@
 else
     if [ $pydnz_source_opt = "git" ] ; then
-    echo "Already git cloned pydnz repository"
+    echo "Already git cloned Python-based Digital NZ API repository: 'pydnz'"
     else
     # Assume "untar"
-    echo "Already untarred pydnz.tar.gz"
+    echo "Already untarred: pydnz.tar.gz"
     fi
 fi
@@ -37 +37 @@
 fi
 
+
+if [ ! -f dnzkey.txt ] ; then
+    echo "Generating 'dnzkey.txt' from 'dnzkey.txt.in'"
+    /bin/cp dnzkey.txt.in dnzkey.txt
+    echo 
+    echo "New edit:"
+    echo "  dnzkey.txt"
+    echo "And change <CHANGEME> to be your actual Digital NZ API key, accessed through:"   
+    echo "  https://digitalnz.org/login"
+    echo
+else
+    echo "Already generated: 'dnzkey.txt'"
+    echo "=> Assuming this has been setup with a valid Digital NZ API key"
+fi

main/trunk/model-sites-dev/atea/collect/digital-nz/prepare/02-RUN.sh

@@ -19 +19 @@
 echo "*    import"
 echo "*"
-echo "* These can be moved to the collection's import folder with:"
+echo "* To remove a previous download set from collection's import folder:"
 echo "*   echo ../import/http* | xargs rm"
+echo "*"
+echo "* To move in a freshly downloaded set into the collection's import folder"
 echo "*   echo import/http* | xargs mv -t ../import/"
 echo "****"

main/trunk/model-sites-dev/atea/collect/digital-nz/prepare/dnz-search-language-mi--python3.py

@@ -14 +14 @@
 
 # DNZ key
-DNZ = dnz.api.Dnz('<CHANGEME>')
+with open('dnzkey.txt','r') as file:
+    dnzkey_str = file.read().strip()
+    
+# print("dnzkey_str = '" + dnzkey_str + "'")
+DNZ = dnz.api.Dnz(dnzkey_str) 
+
 
 #result = dnz.search('kiwi tui')