Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vlkb-siav2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ViaLactea
vlkb-siav2
Commits
594c2140
Commit
594c2140
authored
1 year ago
by
Robert Butora
Browse files
Options
Downloads
Patches
Plain Diff
cosmetic (comments added/cleared)
parent
55fa10fe
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
data-discovery/src/main/java/vlkb/output/Dataset.java
+2
-2
2 additions, 2 deletions
data-discovery/src/main/java/vlkb/output/Dataset.java
data-discovery/src/main/java/vlkb/output/SearchOutputData.java
+1
-0
1 addition, 0 deletions
...discovery/src/main/java/vlkb/output/SearchOutputData.java
with
3 additions
and
2 deletions
data-discovery/src/main/java/vlkb/output/Dataset.java
+
2
−
2
View file @
594c2140
...
@@ -59,7 +59,7 @@ class Dataset
...
@@ -59,7 +59,7 @@ class Dataset
}
}
public
Dataset
(
List
<
Dataset
>
datasetList
,
/*AuthPolicy auth, /*Coord coord,*/
SubsurveyId
subsurveyId
,
String
mergeUrlRoot
,
String
mergeQueryString
)
public
Dataset
(
List
<
Dataset
>
datasetList
,
SubsurveyId
subsurveyId
,
String
mergeUrlRoot
,
String
mergeQueryString
)
{
{
this
.
subsurvey_id
=
datasetList
.
get
(
0
).
subsurvey_id
;
// mergeabiity condition is more then 1 element in list
this
.
subsurvey_id
=
datasetList
.
get
(
0
).
subsurvey_id
;
// mergeabiity condition is more then 1 element in list
this
.
overlapCode
=
5
;
// 5: exact match --> legacy used 0 here FIXME 5 will not be correct on edges of Subsurvey coverage
this
.
overlapCode
=
5
;
// 5: exact match --> legacy used 0 here FIXME 5 will not be correct on edges of Subsurvey coverage
...
@@ -69,7 +69,7 @@ class Dataset
...
@@ -69,7 +69,7 @@ class Dataset
this
.
access
=
new
Access
();
this
.
access
=
new
Access
();
this
.
access
.
accessFileUrl
=
null
;
this
.
access
.
accessFileUrl
=
null
;
this
.
access
.
accessCutoutUrl
=
null
;
this
.
access
.
accessCutoutUrl
=
null
;
this
.
access
.
accessMosaicUrl
=
mergeUrlRoot
+
"?pubdid="
+
publisherDid
+
"&"
+
mergeQueryString
;
// coord.toVoQueryString();
this
.
access
.
accessMosaicUrl
=
mergeUrlRoot
+
"?pubdid="
+
publisherDid
+
"&"
+
mergeQueryString
;
//this.vertices_deg = mergeVertices(datasetList, /*inputs.*/coord);
//this.vertices_deg = mergeVertices(datasetList, /*inputs.*/coord);
}
}
...
...
This diff is collapsed.
Click to expand it.
data-discovery/src/main/java/vlkb/output/SearchOutputData.java
+
1
−
0
View file @
594c2140
...
@@ -26,6 +26,7 @@ class SearchOutputData
...
@@ -26,6 +26,7 @@ class SearchOutputData
return
sod
;
return
sod
;
}
}
// assumes datasetArr is already ordered by subsurveys
private
static
Subsurvey
[]
groupBySubsurveys
(
Dataset
[]
datasetArr
,
private
static
Subsurvey
[]
groupBySubsurveys
(
Dataset
[]
datasetArr
,
SubsurveyId
subsurveyId
,
Subsurvey
[]
dbSubsurveys
,
SubsurveyId
subsurveyId
,
Subsurvey
[]
dbSubsurveys
,
String
mergeUrlRoot
,
String
mergeQueryString
)
String
mergeUrlRoot
,
String
mergeQueryString
)
...
...
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