Project

General

Profile

« Previous | Next » 

Revision 57518

Added by Michele Artini over 4 years ago

View differences:

modules/dnet-orgs-database-application/trunk/src/main/java/eu/dnetlib/organizations/model/OpenaireSimRelPK.java
11 11 
	private static final long serialVersionUID = 2546257975404466712L;
12 12 

  		




  13
  13
  
    
	private String localId;


  		




  14
  
  
    
	private String openaireId;


  		




  
  14
  
    
	private String oaOriginalId;


  		




  15
  15
  
    

  		




  16
  16
  
    
	public String getLocalId() {


  		




  17
  17
  
    
		return localId;


  		




  ......




  21
  21
  
    
		this.localId = localId;


  		




  22
  22
  
    
	}


  		




  23
  23
  
    

  		




  24
  
  
    
	public String getOpenaireId() {


  		




  25
  
  
    
		return openaireId;


  		




  
  24
  
    
	public String getOaOriginalId() {


  		




  
  25
  
    
		return oaOriginalId;


  		




  26
  26
  
    
	}


  		




  27
  27
  
    

  		




  28
  
  
    
	public void setOpenaireId(final String openaireId) {


  		




  29
  
  
    
		this.openaireId = openaireId;


  		




  30
  
  
    
	}


  		




  
  28
  
    
	public void setOaOriginalId(final String oaOriginalId) {


  		




  
  29
  
    
		this.oaOriginalId = oaOriginalId;


  		




  
  30
  
    
	};


  		




  31
  31
  
    

  		




  32
  32
  
    
	@Override


  		




  33
  33
  
    
	public int hashCode() {


  		




  34
  
  
    
		return Objects.hash(localId, openaireId);


  		




  
  34
  
    
		return Objects.hash(localId, oaOriginalId);


  		




  35
  35
  
    
	}


  		




  36
  36
  
    

  		




  37
  37
  
    
	@Override


  		




  ......




  40
  40
  
    
		if (obj == null) { return false; }


  		




  41
  41
  
    
		if (!(obj instanceof OpenaireSimRelPK)) { return false; }


  		




  42
  42
  
    
		final OpenaireSimRelPK other = (OpenaireSimRelPK) obj;


  		




  43
  
  
    
		return Objects.equals(localId, other.localId) && Objects.equals(openaireId, other.openaireId);


  		




  
  43
  
    
		return Objects.equals(localId, other.localId) && Objects.equals(oaOriginalId, other.oaOriginalId);


  		




  44
  44
  
    
	}


  		




  45
  45
  
    

  		




  46
  46
  
    
	@Override


  		




  47
  47
  
    
	public String toString() {


  		




  48
  
  
    
		return String.format("OpenaireSimRelIdPK [localId=%s, openaireId=%s]", localId, openaireId);


  		




  
  48
  
    
		return String.format("OpenaireSimRelPK [localId=%s, oaOriginalId=%s]", localId, oaOriginalId);


  		




  49
  49
  
    
	}


  		




  50
  50
  
    

  		




  51
  51
  
    
}


  		












  

    
      modules/dnet-orgs-database-application/trunk/src/main/java/eu/dnetlib/organizations/model/OpenaireSimRel.java
    
  





  23
  23
  
    
	private String localId;


  		




  24
  24
  
    

  		




  25
  25
  
    
	@Id


  		




  26
  
  
    
	@Column(name = "oa_id")


  		




  27
  
  
    
	private String openaireId;


  		




  28
  
  
    

  		




  29
  26
  
    
	@Column(name = "oa_original_id")


  		




  30
  27
  
    
	private String oaOriginalId;


  		




  31
  28
  
    

  		




  ......




  55
  52
  
    
		this.localId = localId;


  		




  56
  53
  
    
	}


  		




  57
  54
  
    

  		




  58
  
  
    
	public String getOpenaireId() {


  		




  59
  
  
    
		return openaireId;


  		




  60
  
  
    
	}


  		




  61
  
  
    

  		




  62
  
  
    
	public void setOpenaireId(final String openaireId) {


  		




  63
  
  
    
		this.openaireId = openaireId;


  		




  64
  
  
    
	}


  		




  65
  
  
    

  		




  66
  55
  
    
	public String getOaOriginalId() {


  		




  67
  56
  
    
		return oaOriginalId;


  		




  68
  57
  
    
	}


  		












  

    
      modules/dnet-orgs-database-application/trunk/src/main/resources/sql/samples.sql
    
  





  1
  
  
    
--INSERT INTO openaire_simrels(local_id, oa_id, oa_original_id, oa_name, oa_acronym, oa_country, oa_url, oa_collectedfrom) VALUES ('openorgs____::0000022403','opendoar____::b504d1345f7d151031fd7b96333704f0','2323','ITT Technical Institute','ITT','UK','http://','OpenDOAR');


  		




  2
  
  
    
--INSERT INTO openaire_simrels(local_id, oa_id, oa_original_id, oa_name, oa_acronym, oa_country, oa_url, oa_collectedfrom) VALUES ('openorgs____::0000022403','ec__________::927fd71a2e566f9f45ce51047a4db54a','986786','Technical Institute','ITT-TI','UK','http://','EC');


  		




  3
  
  
    
---INSERT INTO openaire_simrels(local_id, oa_id, oa_original_id, oa_name, oa_acronym, oa_country, oa_url, oa_collectedfrom) VALUES ('openorgs____::0000022403','re3data_____::84913f34770f5f7f92af45775009580d','r3344','Institute of Informatics and Telematics','IIT','IT','http://','re3data');


  		




  4
  
  
    
--INSERT INTO openaire_simrels(local_id, oa_id, oa_original_id, oa_name, oa_acronym, oa_country, oa_url, oa_collectedfrom) VALUES ('openorgs____::0000022403','ec__________::9fdd5957f12affa9b7e50cad05c280b3', '9994324','Istituto Italiano di Tecnologia ','IIT','IT','http://','EC');


  		




  5
  
  
    

  		




  6
  1
  
    
INSERT INTO users(email, password, valid, role) VALUES ('michele', '{MD5}'||MD5('dnet'), true, 'SUPERUSER');


  		




  7
  2
  
    
INSERT INTO users(email, password, valid, role) VALUES ('claudio', '{MD5}'||MD5('dnet'), true, 'SUPERUSER');


  		




  8
  3
  
    
INSERT INTO users(email, password, valid, role) VALUES ('emma',    '{MD5}'||MD5('dnet'), true, 'USER');


  		












  

    
      modules/dnet-orgs-database-application/trunk/src/main/resources/sql/importNewRels.sql
    
  





  
  1
  
    
CREATE TEMPORARY TABLE tmp_simrels (


  		




  
  2
  
    
	local_id         text NOT NULL,


  		




  
  3
  
    
	oa_original_id   text NOT NULL,


  		




  
  4
  
    
	oa_name          text NOT NULL,


  		




  
  5
  
    
	oa_acronym       text,


  		




  
  6
  
    
	oa_country       text,


  		




  
  7
  
    
	oa_url           text,


  		




  
  8
  
    
	oa_collectedfrom text


  		




  
  9
  
    
);


  		




  
  10
  
    

  		




  
  11
  
    
COPY tmp_simrels(local_id, oa_original_id, oa_name, oa_acronym, oa_country, oa_url, oa_collectedfrom) FROM '/Users/michele/Develop/dnet45/dnet-orgs-database-application/src/main/resources/tmp_data/rels.part-r-00000.tsv' DELIMITER E'\t';;


  		




  
  12
  
    

  		




  
  13
  
    
INSERT INTO openaire_simrels (local_id, oa_original_id, oa_name, oa_acronym, oa_country, oa_url, oa_collectedfrom)


  		




  
  14
  
    
SELECT local_id, oa_original_id, oa_name, oa_acronym, oa_country, oa_url, oa_collectedfrom


  		




  
  15
  
    
FROM tmp_simrels


  		




  
  16
  
    
ON CONFLICT DO NOTHING;


  		




  
  17
  
    

  		












  

    
      modules/dnet-orgs-database-application/trunk/src/main/resources/sql/schema.sql
    
  





  120
  120
  
    

  		




  121
  121
  
    
CREATE TABLE openaire_simrels (


  		




  122
  122
  
    
	local_id         text REFERENCES organizations(id) ON UPDATE CASCADE,


  		




  123
  
  
    
 	oa_id            text NOT NULL,


  		




  124
  123
  
    
	oa_original_id   text NOT NULL,


  		




  125
  124
  
    
	oa_name          text NOT NULL,


  		




  126
  125
  
    
	oa_acronym       text,


  		




  ......




  128
  127
  
    
	oa_url           text,


  		




  129
  128
  
    
	oa_collectedfrom text,


  		




  130
  129
  
    
	reltype          text NOT NULL DEFAULT 'suggested',


  		




  131
  
  
    
	PRIMARY KEY (local_id, oa_id)


  		




  
  130
  
    
	PRIMARY KEY (local_id, oa_original_id)


  		




  132
  131
  
    
);


  		




  133
  132
  
    
CREATE INDEX openaire_simrels_local_id_idx ON openaire_simrels(local_id);


  		




  134
  133
  
    

  		












  

    
      modules/dnet-orgs-database-application/trunk/src/main/resources/static/resources/html/similarities.html
    
  





  35
  35
  
    
				<tbody>


  		




  36
  36
  
    
					<tr ng-repeat="sr in similarities">


  		




  37
  37
  
    
						<td class="pl-3">


  		




  38
  
  
    
							<a href="https://explore.openaire.eu/search/organization?organizationId={{sr.openaireId}}" target="_blank" title="{{sr.openaireId}}">{{sr.oaName}}</a>


  		




  
  38
  
    
							{{sr.oaName}}


  		




  39
  39
  
    
							<span class="small" ng-if="sr.oaUrl" ><br /><b>URL: </b><a href="{{sr.oaUrl}}" target="_blank">{{sr.oaUrl}}</a></span>


  		




  40
  40
  
    
						</td>


  		




  41
  
  
    
						<td class="text-center">{{sr.oaAcronym}}</td>


  		




  42
  
  
    
						<td class="text-center">{{sr.oaOriginalId}}</td>


  		




  43
  
  
    
						<td class="text-center">{{sr.oaCountry}}</td>


  		




  44
  
  
    
						<td class="text-center">{{sr.oaCollectedFrom}}</td>


  		




  
  41
  
    
						<td class="text-center small">{{sr.oaAcronym}}</td>


  		




  
  42
  
    
						<td class="text-center small">{{sr.oaOriginalId}}</td>


  		




  
  43
  
    
						<td class="text-center small">{{sr.oaCountry}}</td>


  		




  
  44
  
    
						<td class="text-center small">{{sr.oaCollectedFrom}}</td>


  		




  45
  45
  
    
						<td class="text-right">


  		




  46
  46
  
    
							<div class="btn-group btn-group-sm btn-group-toggle" data-toggle="buttons">


  		




  47
  47
  
    
								<label class="btn" ng-class="{'btn-danger' : sr.relType == 'is_different', 'btn-outline-danger' : sr.relType != 'is_different'}">


  		












Also available in:  Unified diff