more changes to solr_import.sh

solr_import.sh

@@ -70,7 +70,7 @@ Import_recursive()
 ############################################################
 
 # Set variables
-directory="/Users/ad7588/projects/patent_site/data"
+directory="/Users/ad7588/projects/patent_site"
 
 # Get the options
 while getopts ":hlimzaespxdw" option; do
@@ -85,7 +85,7 @@ while getopts ":hlimzaespxdw" option; do
         core="all"
         docker exec -it solr bin/solr delete -c $core
         docker exec -it solr solr create_core -c $core -d custom
-        location="POP_Dataset_2022"
+        location="data/POP_Dataset_2022"
           for subdirectory in $location/*/
           do
             subdirectory=${subdirectory%*/}      # remove the trailing "/"
@@ -94,47 +94,47 @@ while getopts ":hlimzaespxdw" option; do
         exit;;
       a) # index ACTIVE folder
         core="active"
-        location="pop_rtfs/ACTIVE (160)"
+        location="data/pop_rtfs/ACTIVE (160)"
         Import
         exit;;
       e) # index EXPANDING folder
         core="expanding"
-        location="pop_rtfs/EXPANDING (169)"
+        location="data/pop_rtfs/EXPANDING (169)"
         Import
         exit;;
       i) # index INVISIBLE folder
         core="invisible"
-        location="pop_rtfs/IN.VISIBLE (204)"
+        location="data/pop_rtfs/IN.VISIBLE (204)"
         Import
         exit;;
       m) # index MULTI-SPECIES folder
         core="multispecies"
-        location="pop_rtfs/MULTI-SPECIES (180)"
+        location="data/pop_rtfs/MULTI-SPECIES (180)"
         Import
         exit;;
       p) # index PISSING & LEAKING folder
         core="pissing"
-        location="pop_rtfs/PISSING & LEAKING (168)"
+        location="data/pop_rtfs/PISSING & LEAKING (168)"
         Import
         exit;;
       x) # index SECRET folder
         core="secret"
-        location="pop_rtfs/SECRET (92)"
+        location="data/pop_rtfs/SECRET (92)"
         Import
         exit;;
       d) # index SELF-DEFENDING folder
         core="defending"
-        location="pop_rtfs/SELF-DEFENDING (115)"
+        location="data/pop_rtfs/SELF-DEFENDING (115)"
         Import
         exit;;
       s) # index SURVIVING folder
         core="surviving"
-        location="pop_rtfs/SURVIVING (166)"
+        location="data/pop_rtfs/SURVIVING (166)"
         Import
         exit;;
       w) # index WORKING folder
         core="working"
-        location="pop_rtfs/WORKING (101)"
+        location="data/pop_rtfs/WORKING (101)"
         Import
         exit;;
       \?) # Invalid option