Project

General

Profile

« Previous | Next » 

Revision 39722

various fixes

View differences:

modules/dnet-openaire-blacklist/trunk/src/main/java/eu/dnetlib/msro/workflows/blacklist/ResolveBlacklistJobNode.java
67 67
		    final String target = fullId(doc.valueOf("//FIELD[./@name='target_type']"), doc.valueOf("//FIELD[./@name='target']"));
68 68
		    rbe.setTarget(getResolvedId(target, hadoopService.describeHBaseColumn(getClusterName(), getTableName(), target).getColumns()));
69 69

  
70
		    rbe.setRelType(doc.valueOf("//FIELD[./@name='hbase_relation_type_encoding']"));
70
		    rbe.setRelType(doc.valueOf("//FIELD[./@name='relationship']"));
71 71

  
72 72
		    resolved.add(rbe);
73 73
	    }
......
87 87
	private String fullId(final String type, final String id) {
88 88
		final String fullId = AbstractDNetOafXsltFunctions.oafSimpleId(type, id);
89 89

  
90
		return OafRowKeyDecoder.decode(fullId).getId();
90
		return OafRowKeyDecoder.decode(fullId).getKey();
91 91
	}
92 92

  
93 93
	private String getResolvedId(String originalId, List<Column> columns) {
modules/dnet-openaire-blacklist/trunk/src/main/java/eu/dnetlib/openaire/blacklist/BlacklistManager.java
43 43
                        blacklistDatabaseName,
44 44
                        String.format(
45 45
		                        "INSERT INTO blacklist(userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects, note) "
46
				                        + " VALUES('%1$s', '%2$s', '%3$s', '%4$s', '%5$s', '%6$s', '%7$s', '%8$s', '%9$s', '%10$s', '%11$s', '%12$s', '%13$s', '%14$s', '%15$s, %16$s') ",
46
				                        + " VALUES('%1$s', '%2$s', '%3$s', '%4$s', '%5$s', '%6$s', '%7$s', '%8$s', '%9$s', '%10$s', '%11$s', '%12$s', '%13$s', '%14$s') ",
47 47
		                        entry.getUser(),
48 48
		                        entry.getRelationship(),
49 49
		                        entry.getProvenance(),
modules/dnet-openaire-blacklist/trunk/src/main/resources/eu/dnetlib/openaire/blacklist/db/dnet_blacklists_data.sql
34 34

  
35 35
CREATE INDEX ON blacklist (source_object);
36 36
CREATE INDEX ON blacklist (target_object);
37
CREATE INDEX ON blacklist (ticket_id);
37
CREATE INDEX ON blacklist (ticket_id, original_source_objects, original_target_objects);
38 38
CREATE INDEX ON blacklist (iis_status);
39 39
CREATE INDEX ON blacklist (status);
40 40

  
......
51 51

  
52 52
-- Just for test
53 53

  
54
INSERT INTO blacklist (userid, relationship, provenance, status, source_object, source_type, target_object, target_type, ticket_id)
55
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'crosswalk',
56
        'ACCEPTED', 'od________18::xxxxxxxxxxxxxxxxxx', 'result',
57
        'corda_______::9826e8aba3e8f3a2a46545cf341838a8', 'project', '1');
58
INSERT INTO blacklist (userid, relationship, provenance, status, source_object, source_type, target_object, target_type, ticket_id)
59
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'crosswalk',
60
        'PENDING', 'od________18::yyyyyyyyyyyyyyyyyyyy', 'result',
61
        'corda_______::9826e8aba3e8f3a2a46545cf341838a8', 'project', '1');
62
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
63
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
64
        'iis::document_referencedProjects',
65
        'UNSOLVED', 'ACCEPTED', 'od______2367::eb76f733498920166d4ce77ec37d4X', 'result',
66
        'corda_______::800e636c0a24ac3767701a789a96baX', 'project', '1360', '{"idsource::origi1", "idsource:orig2"}',
67
        '{"idtarget::origi1", "idtarget:orig2","idtarget:orig3"}');
54
-- INSERT INTO blacklist (userid, relationship, provenance, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
55
-- VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'crosswalk',
56
--        'ACCEPTED', 'od________18::xxxxxxxxxxxxxxxxxx', 'result',
57
--        'corda_______::9826e8aba3e8f3a2a46545cf341838a8', 'project', '1');
58
-- INSERT INTO blacklist (userid, relationship, provenance, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
59
-- VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'crosswalk',
60
--         'PENDING', 'od________18::yyyyyyyyyyyyyyyyyyyy', 'result',
61
--         'corda_______::9826e8aba3e8f3a2a46545cf341838a8', 'project', '1');
62
-- INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
63
-- VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
64
--         'iis::document_referencedProjects',
65
--         'UNSOLVED', 'ACCEPTED', 'od______2367::eb76f733498920166d4ce77ec37d4X', 'result',
66
--         'corda_______::800e636c0a24ac3767701a789a96baX', 'project', '1360', '{"idsource::origi1", "idsource:orig2"}',
67
--         '{"idtarget::origi1", "idtarget:orig2","idtarget:orig3"}');
68 68

  
69 69
-- https://issue.openaire.research-infrastructures.eu/issues/1245
70 70
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
......
81 81
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
82 82
        'iis::document_referencedProjects', 'UNSOLVED', 'ACCEPTED', 'od________18::a727cc288016db7132ef9a799aa83350', 'result',
83 83
        'corda_______::9826e8aba3e8f3a2a46545cf341838a8', 'project', '1360', '{"od________18::a727cc288016db7132ef9a799aa83350"}', '{"corda_______::9826e8aba3e8f3a2a46545cf341838a8"}');
84
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
84
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
85 85
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
86 86
        'iis::document_referencedProjects', 'UNSOLVED', 'ACCEPTED', 'od________18::062cf091d5c7a7d730001c34177042e3', 'result',
87
        'corda_______::9826e8aba3e8f3a2a46545cf341838a8', 'project', '1360');
87
        'corda_______::9826e8aba3e8f3a2a46545cf341838a8', 'project', '1360', '{"od________18::062cf091d5c7a7d730001c34177042e3"}',
88
        '{"corda_______::9826e8aba3e8f3a2a46545cf341838a8"}');
88 89

  
89 90
-- https://issue.openaire.research-infrastructures.eu/issues/1254
90
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
91
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
91 92
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
92 93
        'iis::document_referencedProjects', 'SOLVED',
93 94
        'ACCEPTED', 'webcrawl____::68c191d9b972b47a235d311804c7f6f5', 'result', 'corda_______::c3d0b21615b129cd7395e24f9cf6bb64', 'project',
94
        '1254');
95
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
95
        '1254', '{"webcrawl____::68c191d9b972b47a235d311804c7f6f5"}', '{"corda_______::c3d0b21615b129cd7395e24f9cf6bb64"}');
96
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
96 97
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
97 98
        'iis::document_referencedProjects',
98 99
        'UNSOLVED', 'ACCEPTED', 'od_______908::1b172ab34639e7935e2357119cf20830', 'result',
99
        'corda_______::c3d0b21615b129cd7395e24f9cf6bb64', 'project', '1254');
100
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
100
        'corda_______::c3d0b21615b129cd7395e24f9cf6bb64', 'project', '1254', '{"od_______908::1b172ab34639e7935e2357119cf20830"}',
101
        '{"corda_______::c3d0b21615b129cd7395e24f9cf6bb64"}');
102
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
101 103
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
102 104
        'iis::document_referencedProjects',
103 105
        'UNSOLVED', 'ACCEPTED', 'doajarticles::cb234c66327d29ba5f13c0db7a4cf423', 'result',
104
        'corda_______::c3d0b21615b129cd7395e24f9cf6bb64', 'project', '1254');
106
        'corda_______::c3d0b21615b129cd7395e24f9cf6bb64', 'project', '1254', '{"doajarticles::cb234c66327d29ba5f13c0db7a4cf423"}',
107
        '{"corda_______::c3d0b21615b129cd7395e24f9cf6bb64"}');
105 108

  
106 109
-- https://issue.openaire.research-infrastructures.eu/issues/1297
107
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
110
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
108 111
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
109 112
        'iis::document_referencedProjects', 'UNSOLVED',
110 113
        'ACCEPTED', 'od______1146::e2fafaba636a14e408f02c6ea26acb0e', 'result', 'corda_______::35695c955c51f0bb39482ce5477047c7', 'project',
111
        '1297');
112
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
114
        '1297', '{"od______1146::e2fafaba636a14e408f02c6ea26acb0e"}', '{"corda_______::35695c955c51f0bb39482ce5477047c7"}');
115
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
113 116
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
114 117
        'iis::document_referencedProjects',
115 118
        'UNSOLVED', 'ACCEPTED', 'od_______908::b8e86ed982ff331764456e1f0759ed9c', 'result',
116
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297');
117
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
119
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297', '{"od_______908::b8e86ed982ff331764456e1f0759ed9c"}',
120
        '{"corda_______::35695c955c51f0bb39482ce5477047c7"}');
121
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
118 122
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
119 123
        'iis::document_referencedProjects',
120 124
        'UNSOLVED', 'ACCEPTED', 'webcrawl____::c472bf5944ce0495844d505d43d1c021', 'result',
121
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297');
122
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
125
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297', '{"webcrawl____::c472bf5944ce0495844d505d43d1c021"}',
126
        '{"corda_______::35695c955c51f0bb39482ce5477047c7"}');
127
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
123 128
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
124 129
        'iis::document_referencedProjects',
125 130
        'UNSOLVED', 'ACCEPTED', 'od_______908::bbe86580e44dbefa401d435259baddf1', 'result',
126
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297');
127
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
131
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297', '{"od_______908::bbe86580e44dbefa401d435259baddf1"}',
132
        '{"corda_______::35695c955c51f0bb39482ce5477047c7"}');
133
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
128 134
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
129 135
        'iis::document_referencedProjects',
130 136
        'UNSOLVED', 'ACCEPTED', 'webcrawl____::ae0ae3ea5641ac24fa148ac38397dfcd', 'result',
131
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297');
132
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
137
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297', '{"webcrawl____::ae0ae3ea5641ac24fa148ac38397dfcd"}',
138
        '{"corda_______::35695c955c51f0bb39482ce5477047c7"}');
139
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
133 140
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
134 141
        'iis::document_referencedProjects',
135 142
        'UNSOLVED', 'ACCEPTED', 'webcrawl____::5f46a8c6420f5b5eaf30d7212b0ada5b', 'result',
136
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297');
137
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
143
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297', '{"webcrawl____::5f46a8c6420f5b5eaf30d7212b0ada5b"}',
144
        '{"corda_______::35695c955c51f0bb39482ce5477047c7"}');
145
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
138 146
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
139 147
        'iis::document_referencedProjects',
140 148
        'UNSOLVED', 'ACCEPTED', 'od_______908::49d9b3df9cf7e9c991e09e53677e40e3', 'result',
141
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297');
142
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
149
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297', '{"od_______908::49d9b3df9cf7e9c991e09e53677e40e3"}',
150
        '{"corda_______::35695c955c51f0bb39482ce5477047c7"}');
151
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
143 152
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
144 153
        'iis::document_referencedProjects',
145 154
        'UNSOLVED', 'ACCEPTED', 'od_______330::aa2edd06a6121a1a1db63be83cd7b7c7', 'result',
146
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297');
147
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
155
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297', '{"od_______330::aa2edd06a6121a1a1db63be83cd7b7c7"}',
156
        '{"corda_______::35695c955c51f0bb39482ce5477047c7"}');
157
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
148 158
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
149 159
        'iis::document_referencedProjects',
150 160
        'UNSOLVED', 'ACCEPTED', 'od_______908::45f342e6f10d5543631a757b417388d7', 'result',
151
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297');
152
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
161
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297', '{"od_______908::45f342e6f10d5543631a757b417388d7"}',
162
        '{"corda_______::35695c955c51f0bb39482ce5477047c7"}');
163
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
153 164
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
154 165
        'iis::document_referencedProjects',
155 166
        'UNSOLVED', 'ACCEPTED', 'webcrawl____::6ce2789da52c6036501533ed5613d71a', 'result',
156
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297');
157
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
167
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297', '{"webcrawl____::6ce2789da52c6036501533ed5613d71a"}',
168
        '{"corda_______::35695c955c51f0bb39482ce5477047c7"}');
169
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
158 170
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
159 171
        'iis::document_referencedProjects',
160 172
        'UNSOLVED', 'ACCEPTED', 'webcrawl____::f887afc3d7a8e8c708b9b773d26cdd9d', 'result',
161
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297');
162
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
173
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297', '{"webcrawl____::f887afc3d7a8e8c708b9b773d26cdd9d"}',
174
        '{"corda_______::35695c955c51f0bb39482ce5477047c7"}');
175
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
163 176
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
164 177
        'iis::document_referencedProjects',
165 178
        'UNSOLVED', 'ACCEPTED', 'webcrawl____::161ee67349e268750701ee437188340b', 'result',
166
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297');
179
        'corda_______::35695c955c51f0bb39482ce5477047c7', 'project', '1297', '{"webcrawl____::161ee67349e268750701ee437188340b"}',
180
        '{"corda_______::35695c955c51f0bb39482ce5477047c7"}');
167 181

  
168 182
-- https://issue.openaire.research-infrastructures.eu/issues/1412
169
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id)
183
INSERT INTO blacklist (userid, relationship, provenance, iis_module, iis_status, status, source_object, source_type, target_object, target_type, ticket_id, original_source_objects, original_target_objects)
170 184
VALUES ('unknown', 'resultProject_outcome_isProducedBy', 'iis',
171 185
        'iis::document_referencedProjects',
172 186
        'UNSOLVED', 'ACCEPTED', 'od______2367::eb76f733498920166d4ce77ec37d487c', 'result',
173
        'corda_______::800e636c0a24ac3767701a789a96ba89', 'project', '1360');
187
        'corda_______::800e636c0a24ac3767701a789a96ba89', 'project', '1360', '{"od______2367::eb76f733498920166d4ce77ec37d487c"}',
188
        '{"corda_______::800e636c0a24ac3767701a789a96ba89"}');
174 189

  
175 190

  
176 191

  

Also available in: Unified diff