Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java @ 1016:ff7b81cf9999
Meta data service: Be a bit more tolerant about empty strings for UUIDs of artifact and user.
flys-artifacts/trunk@2462 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 04 Aug 2011 10:24:23 +0000 |
| parents | 9a1a3080ad98 |
| children | 3f3988bb6284 |
comparison
equal
deleted
inserted
replaced
| 1015:9a1a3080ad98 | 1016:ff7b81cf9999 |
|---|---|
| 50 log.debug("MetaDataService.process"); | 50 log.debug("MetaDataService.process"); |
| 51 | 51 |
| 52 String artifactId = XMLUtils.xpathString( | 52 String artifactId = XMLUtils.xpathString( |
| 53 data, XPATH_ARTIFACT_ID, ArtifactNamespaceContext.INSTANCE); | 53 data, XPATH_ARTIFACT_ID, ArtifactNamespaceContext.INSTANCE); |
| 54 | 54 |
| 55 if (artifactId != null | |
| 56 && (artifactId = artifactId.trim()).length() == 0) { | |
| 57 artifactId = null; | |
| 58 } | |
| 59 | |
| 55 String userId = XMLUtils.xpathString( | 60 String userId = XMLUtils.xpathString( |
| 56 data, XPATH_USER_ID, ArtifactNamespaceContext.INSTANCE); | 61 data, XPATH_USER_ID, ArtifactNamespaceContext.INSTANCE); |
| 62 | |
| 63 if (userId != null | |
| 64 && (userId = userId.trim()).length() == 0) { | |
| 65 userId = null; | |
| 66 } | |
| 57 | 67 |
| 58 String outs = XMLUtils.xpathString( | 68 String outs = XMLUtils.xpathString( |
| 59 data, XPATH_OUTS, ArtifactNamespaceContext.INSTANCE); | 69 data, XPATH_OUTS, ArtifactNamespaceContext.INSTANCE); |
| 60 | 70 |
| 61 String parameters = XMLUtils.xpathString( | 71 String parameters = XMLUtils.xpathString( |
| 145 | 155 |
| 146 | 156 |
| 147 Map<String, Object> data = splitParameters( | 157 Map<String, Object> data = splitParameters( |
| 148 parameters, new HashMap<String, Object>()); | 158 parameters, new HashMap<String, Object>()); |
| 149 | 159 |
| 150 String [] outs = outsString.split("\\s*,\\s*"); | 160 String [] outs = outsString == null |
| 161 ? new String [0] | |
| 162 : outsString.split("\\s*,\\s*"); | |
| 151 | 163 |
| 152 Recommendations rec = Recommendations.getInstance(); | 164 Recommendations rec = Recommendations.getInstance(); |
| 153 rec.recommend( | 165 rec.recommend( |
| 154 flysArtifact, userId, outs, data, result); | 166 flysArtifact, userId, outs, data, result); |
| 155 | 167 |