Merge pull request #17 from bioinformatics-ua/fix/urls

aspedrosa · web-flow · commit ff9e0962f795 · 2022-01-17T12:22:21.000Z
Fix/urls + bump solr
diff --git a/geowebservice/docker-compose.yml b/geowebservice/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   solr:
-    image: solr:5.5.3
+    image: solr:8.11
     volumes:
       - geodata:/opt/solr/server/solr
 
diff --git a/geowebservice/geowebservice/urls.py b/geowebservice/geowebservice/urls.py
@@ -3,8 +3,8 @@
 
 urlpatterns = [
     # get child locations by geonameid
-    re_path(r"^geodropdown/geodatabase/(?P<geonameid>\d+)/$", views.detail),
+    re_path(r"^geodatabase/(?P<geonameid>\d+)/$", views.detail),
 
     # get coordinates by name and fcode
-    re_path(r"^geodropdown/geodatabase/(?P<location>[a-zA-Z, ]+)/$", views.getCoordinates),
+    re_path(r"^geodatabase/(?P<location>[a-zA-Z, ]+)/$", views.getCoordinates),
 ]
diff --git a/geowebservice/start.sh b/geowebservice/start.sh
@@ -12,7 +12,7 @@ done
 (
     set -e
 
-    docker-compose exec -T solr sh -c "solr create_core -c geonames -d basic_configs"
+    docker-compose exec -T solr sh -c "solr create_core -c geonames -d _default"
 
     docker-compose up -d geodropdownservice
 

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`
`4`	`4`	`urlpatterns = [`
`5`	`5`	`# get child locations by geonameid`
`6`		`- re_path(r"^geodropdown/geodatabase/(?P<geonameid>\d+)/$", views.detail),`
	`6`	`+ re_path(r"^geodatabase/(?P<geonameid>\d+)/$", views.detail),`
`7`	`7`
`8`	`8`	`# get coordinates by name and fcode`
`9`		`- re_path(r"^geodropdown/geodatabase/(?P<location>[a-zA-Z, ]+)/$", views.getCoordinates),`
	`9`	`+ re_path(r"^geodatabase/(?P<location>[a-zA-Z, ]+)/$", views.getCoordinates),`
`10`	`10`	`]`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ done`
`12`	`12`	`(`
`13`	`13`	`set -e`
`14`	`14`
`15`		`- docker-compose exec -T solr sh -c "solr create_core -c geonames -d basic_configs"`
	`15`	`+ docker-compose exec -T solr sh -c "solr create_core -c geonames -d _default"`
`16`	`16`
`17`	`17`	`docker-compose up -d geodropdownservice`
`18`	`18`