Project

General

Profile

« Previous | Next » 

Revision 63086

Added by Claudio Atzori 8 months ago

applied changes after depending on dnet-openaireplus-mapping-utils:7.0.1

View differences:

modules/dnet-openaireplus-workflows/trunk/pom.xml
59 59 
		<dependency>
60 60 
			<groupId>eu.dnetlib</groupId>
61 61 
			<artifactId>dnet-openaireplus-mapping-utils</artifactId>
62 
			<version>[6.3.24,7.0.0)</version>
62 
			<version>[7.0.0,8.0.0)</version>
63 63 
                        <exclusions>
64 64 
                                <exclusion>
65 65 
                                        <artifactId>dnet-index-solr-common</artifactId>
......
108 108 
		<dependency>
109 109 
			<groupId>eu.dnetlib</groupId>
110 110 
			<artifactId>dnet-index-client</artifactId>
111 
			<version>[2.3.4,3.0.0)</version>
112 
                        <exclusions>
113 
                                <exclusion>
114 
                                        <artifactId>dnet-index-solr-common</artifactId>
115 
                                        <groupId>eu.dnetlib</groupId>
116 
                                </exclusion>
117 
                        </exclusions>
111 
			<version>[3.0.0,4.0.0)</version>
112 
			<exclusions>
113 
					<exclusion>
114 
							<artifactId>dnet-index-solr-common</artifactId>
115 
							<groupId>eu.dnetlib</groupId>
116 
					</exclusion>
117 
			</exclusions>
118 118 
		</dependency>
119 119 

  		




  120
  120
  
    
		<dependency>


  		




  ......




  127
  127
  
    
			<groupId>eu.dnetlib</groupId>


  		




  128
  128
  
    
			<artifactId>dnet-deduplication</artifactId>


  		




  129
  129
  
    
			<version>[2.0.0,3.0.0)</version>


  		




  
  130
  
    
			<exclusions>


  		




  
  131
  
    
				<exclusion>


  		




  
  132
  
    
					<groupId>eu.dnetlib</groupId>


  		




  
  133
  
    
					<artifactId>dnet-openaireplus-mapping-utils</artifactId>


  		




  
  134
  
    
				</exclusion>


  		




  
  135
  
    
				<exclusion>


  		




  
  136
  
    
					<groupId>eu.dnetlib</groupId>


  		




  
  137
  
    
					<artifactId>dnet-directindex-api</artifactId>


  		




  
  138
  
    
				</exclusion>


  		




  
  139
  
    
				<exclusion>


  		




  
  140
  
    
					<groupId>eu.dnetlib</groupId>


  		




  
  141
  
    
					<artifactId>dnet-index-client</artifactId>


  		




  
  142
  
    
				</exclusion>


  		




  
  143
  
    
			</exclusions>


  		




  130
  144
  
    
		</dependency>


  		




  131
  145
  
    

  		




  132
  146
  
    
		<!-- modular ui and servlet api are here because of the stats controller -->


  		




  133
  147
  
    
		<dependency>


  		




  134
  148
  
    
			<groupId>eu.dnetlib</groupId>


  		




  135
  149
  
    
			<artifactId>dnet-directindex-api</artifactId>


  		




  136
  
  
    
			<version>[2.1.13,3.0.0)</version>


  		




  
  150
  
    
			<version>[4.0.0,5.0.0)</version>


  		




  137
  151
  
    
		</dependency>


  		




  138
  152
  
    

  		




  139
  153
  
    
		<dependency>


  		




  ......




  208
  222
  
    
					<groupId>net.sf.saxon</groupId>


  		




  209
  223
  
    
					<artifactId>Saxon-HE</artifactId>


  		




  210
  224
  
    
				</exclusion>


  		




  
  225
  
    
				<exclusion>


  		




  
  226
  
    
					<groupId>eu.dnetlib</groupId>


  		




  
  227
  
    
					<artifactId>dnet-pace-core</artifactId>


  		




  
  228
  
    
				</exclusion>


  		




  211
  229
  
    
			</exclusions>


  		




  212
  230
  
    
		</dependency>


  		




  213
  231
  
    
                <dependency>


  		












  

    
      modules/dnet-openaireplus-workflows/trunk/src/main/java/eu/dnetlib/msro/openaireplus/workflows/nodes/index/FeedMissingClaimsJobNode.java
    
  





  52
  52
  
    
        final String format =


  		




  53
  53
  
    
                nodeToken.getEnv().hasAttribute("format") ? nodeToken.getEnv().getAttribute("format") : nodeToken.getFullEnv().getAttribute("format");


  		




  54
  54
  
    
        final String coll = format + "-index-openaire";


  		




  55
  
  
    
        final String indexDsId = nodeToken.getEnv().getAttribute("index_id");


  		




  56
  55
  
    
        final String baseUrl = calculateIndexBaseUrl();


  		




  57
  56
  
    

  		




  58
  57
  
    
        CloudIndexClient idxClient = null;


  		




  ......




  78
  77
  
    
                    toDeleteFromCache.add(id);


  		




  79
  78
  
    
                } else {


  		




  80
  79
  
    
                    max_attempts = ATTEMPTS;


  		




  81
  
  
    
                    toFeed.add(prepareSolrDoc(idxClient, baseUrl, coll, id, record, indexDsId, xslt, max_attempts));


  		




  
  80
  
    
                    toFeed.add(prepareSolrDoc(idxClient, baseUrl, coll, id, record, xslt, max_attempts));


  		




  82
  81
  
    
                }


  		




  83
  82
  
    
                if (count % BATCH_SIZE == 0) processLists(idxClient, baseUrl, coll, toFeed, toDeleteFromCache);


  		




  84
  83
  
    
            }


  		




  ......




  113
  112
  
    
        }


  		




  114
  113
  
    
    }


  		




  115
  114
  
    

  		




  116
  
  
    
    protected SolrInputDocument prepareSolrDoc(CloudIndexClient idxClient, String baseUrl, String coll, String recordId, String record, String indexDsId, ApplyXslt xslt, int attempt) throws IOException, CloudIndexClientException, MSROException, InterruptedException {


  		




  
  115
  
    
    protected SolrInputDocument prepareSolrDoc(CloudIndexClient idxClient, String baseUrl, String coll, String recordId, String record, ApplyXslt xslt, int attempt) throws IOException, CloudIndexClientException, MSROException, InterruptedException {


  		




  117
  116
  
    
        try {


  		




  118
  
  
    
            return idxClient.prepareSolrDocument(record, indexDsId, xslt);


  		




  
  117
  
    
            return idxClient.prepareSolrDocument(record, xslt);


  		




  119
  118
  
    
        } catch (CloudIndexClientException cie) {


  		




  120
  119
  
    
            log.error(String.format("Error preparing Solr doc for %s, message: %s. Trying again, remaining attempts:", recordId, cie, attempt));


  		




  121
  120
  
    
            idxClient = resetCloudIndexClient(idxClient, baseUrl, coll);


  		




  122
  121
  
    
            if (attempt > 0)


  		




  123
  
  
    
                return prepareSolrDoc(idxClient, baseUrl, coll, recordId, record, indexDsId, xslt, --attempt);


  		




  
  122
  
    
                return prepareSolrDoc(idxClient, baseUrl, coll, recordId, record, xslt, --attempt);


  		




  124
  123
  
    
            else {


  		




  125
  124
  
    
                String msg = String.format("Too many attempts %d to recreate the index client for preparing SolrDocument for %s", ATTEMPTS, id);


  		




  126
  125
  
    
                log.error(msg);


  		












Also available in:  Unified diff