Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
isochrone-vm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Institut für Informatik
dbis
dbis-isochrone
isochrone-vm
Commits
bb13d485
Commit
bb13d485
authored
9 years ago
by
User expired
Browse files
Options
Downloads
Patches
Plain Diff
changes due to rename in isochrone-datamodel
parent
c692b970
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
bootstrap/importData.sh
+1
-1
1 addition, 1 deletion
bootstrap/importData.sh
bootstrap/prepareEnvironment.sh
+1
-1
1 addition, 1 deletion
bootstrap/prepareEnvironment.sh
with
3 additions
and
2 deletions
CHANGELOG.md
+
1
−
0
View file @
bb13d485
Upcoming version:
Upcoming version:
-----------------
-----------------
-
changes due to rename in isochrone-datamodel (Nikolaus Krismer)
-
version updates (Nikolaus Krismer)
-
version updates (Nikolaus Krismer)
-
deactivating invalid datasets (Nikolaus Krismer)
-
deactivating invalid datasets (Nikolaus Krismer)
-
added some more logging output to dataset generation (Nikolaus Krismer)
-
added some more logging output to dataset generation (Nikolaus Krismer)
...
...
This diff is collapsed.
Click to expand it.
bootstrap/importData.sh
+
1
−
1
View file @
bb13d485
...
@@ -147,7 +147,7 @@ function fn_import_dataset_postgis() {
...
@@ -147,7 +147,7 @@ function fn_import_dataset_postgis() {
if
$AVAILABLE_ISOCHRONE_DATAMODEL
&&
[
!
-f
"
$DATA_DIR
/
$SQL_EXPORT_FILE
"
]
;
then
if
$AVAILABLE_ISOCHRONE_DATAMODEL
&&
[
!
-f
"
$DATA_DIR
/
$SQL_EXPORT_FILE
"
]
;
then
echo
" - creating datamodel using isochrone-datamodel"
echo
" - creating datamodel using isochrone-datamodel"
# Create datamodel using isochrone-datamodel project
# Create datamodel using isochrone-datamodel project
DB_USERNAME
=
"
$PG_DB_USER
"
DB_PASSWORD
=
"
$PG_DB_PASSWORD
"
"
$DEPLOY_DIR
/isochrone-datamodel/
builder
.sh"
-d
-s
-b
-l
-t
${
SRID
}
-c
${
CITY
}
>>
"
$WORKING_DIR
/create_datamodel_
${
CITY
}
_
${
SRID
}
.log"
2>&1
DB_USERNAME
=
"
$PG_DB_USER
"
DB_PASSWORD
=
"
$PG_DB_PASSWORD
"
"
$DEPLOY_DIR
/isochrone-datamodel/
osmPti2mmds
.sh"
-d
-s
-b
-l
-t
${
SRID
}
-c
${
CITY
}
>>
"
$WORKING_DIR
/create_datamodel_
${
CITY
}
_
${
SRID
}
.log"
2>&1
if
[
$?
-ne
0
]
;
then
if
[
$?
-ne
0
]
;
then
printf
"%s
\n
"
"[ERROR] An error occurred while creating datamodel using isochrone-datamodel. The process will exit now with status
$?
"
printf
"%s
\n
"
"[ERROR] An error occurred while creating datamodel using isochrone-datamodel. The process will exit now with status
$?
"
exit
$?
exit
$?
...
...
This diff is collapsed.
Click to expand it.
bootstrap/prepareEnvironment.sh
+
1
−
1
View file @
bb13d485
...
@@ -542,7 +542,7 @@ if $INSTALL_ISOCHRONE_DATAMODEL; then
...
@@ -542,7 +542,7 @@ if $INSTALL_ISOCHRONE_DATAMODEL; then
cp
$DOWNLOAD_DIR
/
$NEXUS_ARTIFACT_NAME_DATAMODEL
.jar
$DEPLOY_DIR
/
>>
$WORKING_DIR
/install_isochrone_datamodel.log 2>&1
cp
$DOWNLOAD_DIR
/
$NEXUS_ARTIFACT_NAME_DATAMODEL
.jar
$DEPLOY_DIR
/
>>
$WORKING_DIR
/install_isochrone_datamodel.log 2>&1
unzip
-o
-d
"
$DEPLOY_DIR
/isochrone-datamodel"
$DEPLOY_DIR
/
$NEXUS_ARTIFACT_NAME_DATAMODEL
.jar
>>
$WORKING_DIR
/install_isochrone_datamodel.log 2>&1
unzip
-o
-d
"
$DEPLOY_DIR
/isochrone-datamodel"
$DEPLOY_DIR
/
$NEXUS_ARTIFACT_NAME_DATAMODEL
.jar
>>
$WORKING_DIR
/install_isochrone_datamodel.log 2>&1
DATAMODEL_VERSION_STRING
=
$(
grep
$DEPLOY_DIR
/isochrone-datamodel/
builder
.sh
-e
"^VERSION=
\"
.*
\"
$"
)
DATAMODEL_VERSION_STRING
=
$(
grep
$DEPLOY_DIR
/isochrone-datamodel/
osmPti2mmds
.sh
-e
"^VERSION=
\"
.*
\"
$"
)
DATAMODEL_VERSION_STRING
=
${
DATAMODEL_VERSION_STRING
#*\
"}
DATAMODEL_VERSION_STRING
=
${
DATAMODEL_VERSION_STRING
#*\
"}
DATAMODEL_VERSION_STRING=
${
DATAMODEL_VERSION_STRING
%\
"*}
DATAMODEL_VERSION_STRING=
${
DATAMODEL_VERSION_STRING
%\
"*}
mkdir -p "
$DEPLOY_DIR
/isochrone-datamodel/build/libs
" >>
$WORKING_DIR
/install_isochrone_datamodel.log 2>&1
mkdir -p "
$DEPLOY_DIR
/isochrone-datamodel/build/libs
" >>
$WORKING_DIR
/install_isochrone_datamodel.log 2>&1
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment