Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
4992d357
Commit
4992d357
authored
7 years ago
by
gakin
Browse files
Options
Downloads
Patches
Plain Diff
SSDM-4584 : OpenbisSync nameTranslator bug fix.
SVN: 38061
parent
f3adc167
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
datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParser.java
+5
-8
5 additions, 8 deletions
...ugins/sync/harvester/synchronizer/ResourceListParser.java
with
5 additions
and
8 deletions
datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParser.java
+
5
−
8
View file @
4992d357
...
@@ -405,7 +405,10 @@ public class ResourceListParser
...
@@ -405,7 +405,10 @@ public class ResourceListParser
private
SpaceIdentifier
createSpaceIdentifier
(
String
space
)
private
SpaceIdentifier
createSpaceIdentifier
(
String
space
)
{
{
return
new
SpaceIdentifier
(
nameTranslator
.
translate
(
space
));
assert
space
!=
null
:
"Space id cannot be null"
;
String
translatedSpaceId
=
nameTranslator
.
translate
(
space
);
data
.
getHarvesterSpaceList
().
add
(
translatedSpaceId
);
return
new
SpaceIdentifier
(
translatedSpaceId
);
}
}
private
void
parseMaterialMetaData
(
XPath
xpath
,
String
permId
,
Node
xdNode
,
Date
lastModificationDate
)
private
void
parseMaterialMetaData
(
XPath
xpath
,
String
permId
,
Node
xdNode
,
Date
lastModificationDate
)
...
@@ -571,13 +574,7 @@ public class ResourceListParser
...
@@ -571,13 +574,7 @@ public class ResourceListParser
private
String
extractSpace
(
Node
xdNode
,
boolean
nullAllowed
)
private
String
extractSpace
(
Node
xdNode
,
boolean
nullAllowed
)
{
{
String
space
=
extractAttribute
(
xdNode
,
"space"
,
nullAllowed
);
return
extractAttribute
(
xdNode
,
"space"
,
nullAllowed
);
if
(
space
!=
null
)
{
// space = nameTranslator.translate(space);
data
.
getHarvesterSpaceList
().
add
(
space
);
}
return
space
;
}
}
private
String
extractPermIdFromURI
(
String
uri
)
throws
XPathExpressionException
private
String
extractPermIdFromURI
(
String
uri
)
throws
XPathExpressionException
...
...
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