Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
phis-import
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
4P
Modules
phis-import
Commits
98c38973
Commit
98c38973
authored
11 months ago
by
Antony Tong
Browse files
Options
Downloads
Patches
Plain Diff
Remove call to old PHIS instances
parent
19350273
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
phis-import-drone/src/main/java/com/inra/phis/importdrone/ImportData.java
+4
-18
4 additions, 18 deletions
...e/src/main/java/com/inra/phis/importdrone/ImportData.java
with
4 additions
and
18 deletions
phis-import-drone/src/main/java/com/inra/phis/importdrone/ImportData.java
+
4
−
18
View file @
98c38973
...
...
@@ -300,7 +300,7 @@ public class ImportData {
String
[]
expermimentsURIs
=
{};
String
[]
radiometricTargetUris
=
{};
String
target
=
null
;
boolean
phisV2
=
fals
e
;
boolean
phisV2
=
tru
e
;
boolean
importPlots
=
false
;
boolean
importVignetings
=
false
;
...
...
@@ -389,12 +389,6 @@ public class ImportData {
}
}
if
(
Objects
.
nonNull
(
date
))
{
try
{
phisV2
=
date
.
after
(
session1
.
parse
(
"31/12/2021 23:59"
));
}
catch
(
ParseException
e
)
{
logger
.
error
(
e
.
getMessage
());
System
.
exit
(-
1
);
}
campaign
=
year
.
format
(
date
);
}
}
...
...
@@ -436,18 +430,10 @@ public class ImportData {
TokenDTO
token
=
null
;
PhisCoreTokenDTO
tokenPhisCore
=
null
;
if
(
phisV2
)
{
logger
.
debug
(
"Create token PHIS V2"
);
url
=
Installation
.
getRestURLV2
(
installation
);
tokenPhisCore
=
importData
.
getPhisCoreToken
(
url
);
}
else
{
logger
.
debug
(
"Create token PHIS V1"
);
url
=
Installation
.
getRestURL
(
installation
);
token
=
importData
.
getToken
(
url
);
}
logger
.
debug
(
"Create token PHIS V2"
);
url
=
Installation
.
getRestURLV2
(
installation
);
tokenPhisCore
=
importData
.
getPhisCoreToken
(
url
);
logger
.
debug
(
"ImportData : installation url = {}"
,
url
);
if
(
importPlots
)
{
...
...
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