Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
vMap
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Open source
vMap
Commits
457060db
Commit
457060db
authored
6 years ago
by
Armand Bahi
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into next_version
parents
4a400f14
9862a97c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+0
-6
0 additions, 6 deletions
.gitignore
_install/dependencies/pycron/crontab.txt
+9
-6
9 additions, 6 deletions
_install/dependencies/pycron/crontab.txt
vas/rest/ws/vitis/Versions.class.inc
+201
-203
201 additions, 203 deletions
vas/rest/ws/vitis/Versions.class.inc
with
210 additions
and
215 deletions
.gitignore
+
0
−
6
View file @
457060db
vas/rest/class/*
vas/rest/class/!*/
vas/rest/class/!*.*
vas/sql/*
vas/sql/!*/
vas/sql/!*.*
This diff is collapsed.
Click to expand it.
_install/dependencies/pycron/crontab.txt
+
9
−
6
View file @
457060db
#<gtf_subscription [ServerName] [vasDir]>
0 23 * * * "[engineDir]/php/php" "[engineDir]/subscription.php" 1
0 23 * * mon "[engineDir]/php/php" "[engineDir]/subscription.php" 2
0 23 1 * * "[engineDir]/php/php" "[engineDir]/subscription.php" 3
*/5 * * * * "[engineDir]/php/php" "[engineDir]/subscription.php" 4
#</gtf_subscription [ServerName] [vasDir]>
\ No newline at end of file
#<gtf_subscription [SERVER_NAME] [ENGINE_DIR]>
0 23 * * * "[PHP_PATH]" "[ENGINE_DIR]/subscription.php" 1
0 23 * * mon "[PHP_PATH]" "[ENGINE_DIR]/subscription.php" 2
0 23 1 * * "[PHP_PATH]" "[ENGINE_DIR]/subscription.php" 3
*/5 * * * * "[PHP_PATH]" "[ENGINE_DIR]/subscription.php" 4
#</gtf_subscription [ServerName] [ENGINE_DIR]>
#<gtf_message [SERVER_NAME] [MESSAGE_DIR]>
*/1 * * * * "[PHP_PATH]" "[MESSAGE_DIR]/processMessages.php" 4
#</gtf_message [SERVER_NAME] [MESSAGE_DIR]>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
vas/rest/ws/vitis/Versions.class.inc
+
201
−
203
View file @
457060db
...
...
@@ -141,11 +141,9 @@ class Versions extends Vitis {
$aVersion
=
explode
(
"."
,
$sPostgresql
);
$bExtension
=
false
;
if
(
$aVersion
[
0
]
>=
9
)
{
if
(
$aVersion
[
1
]
>=
1
)
{
if
(
$aVersion
[
0
]
.
$aVersion
[
1
]
>=
91
)
{
$bExtension
=
true
;
}
}
if
(
$bExtension
==
true
)
{
$sSql
=
"SELECT default_version FROM pg_catalog.pg_available_extensions where name = 'postgis';"
;
$oPDOresult
=
$this
->
oConnection
->
oBd
->
executeWithParams
(
$sSql
,
array
());
...
...
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