diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/MainApplication.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/MainApplication.java index 34094f14..7e24b9d0 100644 --- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/MainApplication.java +++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/MainApplication.java @@ -3,6 +3,7 @@ package eu.dnetlib.organizations; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; +import org.springframework.scheduling.annotation.EnableScheduling; import eu.dnetlib.common.app.AbstractDnetApp; import springfox.documentation.builders.ApiInfoBuilder; @@ -14,6 +15,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @SpringBootApplication @EnableSwagger2 @EnableCaching +@EnableScheduling public class MainApplication extends AbstractDnetApp { public static void main(final String[] args) { diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/OrganizationController.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/OrganizationController.java index 37ad4ae0..671c99e5 100644 --- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/OrganizationController.java +++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/OrganizationController.java @@ -54,6 +54,8 @@ import eu.dnetlib.organizations.utils.OrganizationStatus; @RequestMapping("/api/organizations") public class OrganizationController extends AbstractDnetController { + private static final String SPECIAL_STATUS_FOR_CANDIDATE_DUP = "candidate_dup"; + @Autowired private OrganizationViewRepository organizationViewRepository; @Autowired @@ -223,19 +225,24 @@ public class OrganizationController extends AbstractDnetController { @RequestParam(required = false, defaultValue = "") final String status, final Authentication authentication) { - final List statuses; - - if (StringUtils.isNotBlank(status)) { - statuses = Arrays.asList(status.split(",")); - } else if (UserInfo.isSimpleUser(authentication)) { - statuses = Arrays.asList(OrganizationStatus.approved.toString()); + if (status.equals(SPECIAL_STATUS_FOR_CANDIDATE_DUP)) { + return UserInfo.isSuperAdmin(authentication) + ? organizationSimpleViewRepository.searchCandidateDuplicates(q, PageRequest.of(page, size)) + : organizationSimpleViewRepository.searchCandidateDuplicatesForUser(q, UserInfo.getEmail(authentication), PageRequest.of(page, size)); } else { - statuses = Arrays.asList(OrganizationStatus.approved.toString(), OrganizationStatus.suggested.toString()); - } + final List statuses; + if (StringUtils.isNotBlank(status)) { + statuses = Arrays.asList(status.split(",")); + } else if (UserInfo.isSimpleUser(authentication)) { + statuses = Arrays.asList(OrganizationStatus.approved.toString()); + } else { + statuses = Arrays.asList(OrganizationStatus.approved.toString(), OrganizationStatus.suggested.toString()); + } - return UserInfo.isSuperAdmin(authentication) - ? organizationSimpleViewRepository.search(q, statuses, PageRequest.of(page, size)) - : organizationSimpleViewRepository.searchForUser(q, UserInfo.getEmail(authentication), statuses, PageRequest.of(page, size)); + return UserInfo.isSuperAdmin(authentication) + ? organizationSimpleViewRepository.search(q, statuses, PageRequest.of(page, size)) + : organizationSimpleViewRepository.searchForUser(q, UserInfo.getEmail(authentication), statuses, PageRequest.of(page, size)); + } } @GetMapping("/byCountry/{status}/{code}/{page}/{size}") diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/model/view/OrganizationSimpleView.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/model/view/OrganizationSimpleView.java index e30a32df..3c58f49e 100644 --- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/model/view/OrganizationSimpleView.java +++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/model/view/OrganizationSimpleView.java @@ -53,23 +53,24 @@ public class OrganizationSimpleView implements Serializable, Comparable findByTypeAndStatusForUser(String type, String status, String name, Pageable pageable); + // SEARCH FOR VALID DUPLICATE CANDIDATES + @Query(value = "select o.* from organizations_simple_view o left outer join org_index_search idx on (idx.id = o.id) where idx.txt @@ plainto_tsquery(:text) and o.candidate_dup order by o.name", nativeQuery = true) + Page searchCandidateDuplicates(@Param("text") String text, Pageable pageable); + + // SEARCH FOR VALID DUPLICATE CANDIDATES FOR USER + @Query(value = "select o.* from organizations_simple_view o left outer join org_index_search idx on (idx.id = o.id) left outer join user_countries uc on (uc.country = o.country) where idx.txt @@ plainto_tsquery(:text) and uc.email = :email and o.candidate_dup order by o.name", nativeQuery = true) + Page searchCandidateDuplicatesForUser(@Param("text") String text, @Param("email") String email, Pageable pageable); + } diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java index ff9872f4..93aa35b2 100644 --- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java +++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java @@ -1,6 +1,7 @@ package eu.dnetlib.organizations.utils; import java.time.OffsetDateTime; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.LinkedHashSet; @@ -23,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; @@ -210,32 +212,63 @@ public class DatabaseUtils { public void saveDuplicates(final List simrels, final String user) { final OffsetDateTime now = OffsetDateTime.now(); - final List list = openaireDuplicateRepository.saveAll(simrels.stream() - .filter(d -> !d.getOaOriginalId().startsWith(OpenOrgsConstants.OPENORGS_PENDING_PREFIX)) - .collect(Collectors.toList())); + // Set is_different all the existing relations that refer to the new duplicates (suggested or is_similar) - simrels.stream() - .map(OpenaireDuplicate::getOaOriginalId) - .filter(id -> id.startsWith(OpenOrgsConstants.OPENORGS_PENDING_PREFIX)) - .distinct() - .forEach(organizationRepository::deleteById); + final List toSave = new ArrayList<>(); + toSave.addAll(simrels); - list.forEach(d -> { + final List toDelete = new ArrayList<>(); + + for (final OpenaireDuplicate r1 : simrels) { + if (!r1.getRelType().equals(SimilarityType.is_different.toString())) { + for (final OpenaireDuplicate r2 : openaireDuplicateRepository.findByOaOriginalId(r1.getOaOriginalId())) { + if (r2.getLocalId().startsWith(OpenOrgsConstants.OPENORGS_PENDING_PREFIX)) { + toDelete.add(r2); + } else if (!r1.getLocalId().equals(r2.getLocalId())) { + toSave.add(r2); + } + } + } + } + + // Save the new rels + openaireDuplicateRepository.saveAll(toSave).forEach(d -> { openaireDuplicateRepository.updateCreatedByIfMissing(d.getLocalId(), d.getOaOriginalId(), user); openaireDuplicateRepository.updateModificationDate(d.getLocalId(), d.getOaOriginalId(), user, now); }); + log.info("Simrels saved (contains also the fixed rels): " + toSave.size()); - final String message = String.format("Duplicates updated (%s similars, %s differents, %s suggested)", list.stream() + // delete rels to pending orgs + openaireDuplicateRepository.deleteAll(toDelete); + log.info("Simrels related to a pending orgs deleted: " + toDelete.size()); + + final String message = String.format("Duplicates updated (%s similars, %s differents, %s suggested)", simrels.stream() .filter(d -> d.getRelType().equals(SimilarityType.is_similar.toString())) - .count(), list.stream() + .count(), simrels.stream() .filter(d -> d.getRelType().equals(SimilarityType.is_different.toString())) - .count(), list.stream().filter(d -> d.getRelType().equals(SimilarityType.suggested.toString())).count()); + .count(), simrels.stream().filter(d -> d.getRelType().equals(SimilarityType.suggested.toString())).count()); - list.stream() + simrels.stream() .map(OpenaireDuplicate::getLocalId) .distinct() .map(id -> new JournalEntry(id, JournalOperations.DUPLICATES, message, user)) .forEach(journalEntryRepository::save); + } + + @Scheduled(fixedRate = 300000) + public void verifyConsistency() { + + log.info("Verify consistency (START)"); + + // delete invalid pending orgs (without simrels) + final int n = jdbcTemplate + .update("delete from organizations where id in (select o.id from organizations o left outer join oa_duplicates d on (o.id = d.local_id) where o.status = 'suggested' and o.created_by = 'dedupWf' group by o.id having count(d.local_id) = 0)"); + + if (n > 0) { + log.info("Invalid pending orgs deleted: " + n); + } + + log.info("Verify consistency (END)"); } diff --git a/apps/dnet-orgs-database-application/src/main/resources/sql/schema.sql b/apps/dnet-orgs-database-application/src/main/resources/sql/schema.sql index 0836892e..c152e037 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/sql/schema.sql +++ b/apps/dnet-orgs-database-application/src/main/resources/sql/schema.sql @@ -559,11 +559,17 @@ CREATE VIEW organizations_simple_view AS SELECT org.country, org.status, array_remove(array_agg(DISTINCT a.acronym), NULL) AS acronyms, - array_remove(array_agg(DISTINCT u.url), NULL) AS urls + array_remove(array_agg(DISTINCT u.url), NULL) AS urls, + count(DISTINCT d1.oa_original_id) FILTER (WHERE d1.reltype = 'is_similar' ) AS n_similar_dups, + count(DISTINCT d1.oa_original_id) FILTER (WHERE d1.reltype = 'suggested' ) AS n_suggested_dups, + count(DISTINCT d1.oa_original_id) FILTER (WHERE d1.reltype = 'is_different') AS n_different_dups, + (org.status = 'raw' AND not('is_similar' = ANY(array_agg(d2.reltype)))) AS candidate_dup FROM organizations org LEFT OUTER JOIN acronyms a ON (org.id = a.id) LEFT OUTER JOIN urls u ON (org.id = u.id) + LEFT OUTER JOIN oa_duplicates d1 ON (org.id = d1.local_id) + LEFT OUTER JOIN oa_duplicates d2 ON (org.id = d2.oa_original_id) GROUP BY org.id, org.name, diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/anomalies.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/anomalies.html index 4f9f3de1..159c5e10 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/anomalies.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/anomalies.html @@ -128,7 +128,7 @@ tmp_dedup_events - 236350 + 236394 diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/columns.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/columns.html index 6ee807c1..2dc103b9 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/columns.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/columns.html @@ -109,20 +109,7 @@ "tableType": "Table", "keyClass": "", "keyTitle": "", - "name": "ec_nutscode", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "local_id", + "name": "oa_country", "type": "text", "length": 2147483647, "nullable": "√", @@ -130,318 +117,6 @@ "defaultValue": "null", "comments": "" }, - { - "tableName": "oa_duplicates_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "ec_nutscode", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "user_roles", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>role", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "notes", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "modified_by", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "conflict_groups_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "city_1", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>oa_original_id", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "other_ids", - "type": "jsonb", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "tmp_dedup_events", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "oa_acronym", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "reltype", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "'suggested'::text", - "comments": "" - }, - { - "tableName": "tmp_dedup_events", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "ec_researchorganization", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_conflicts", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "created_by", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "ec_smevalidated", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "tmp_dedup_events", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "ec_highereducation", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "users", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "last_access", - "type": "timestamptz", - "length": 35, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "now()", - "comments": "" - }, - { - "tableName": "languages", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>val", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "modified_by", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "notes", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "modification_date", - "type": "timestamp", - "length": 29, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "urls", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>url", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_conflicts", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>id2", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "ec_internationalorganizationeurinterests", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "ec_highereducation", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "name", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "ec_nonprofit", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "users", - "tableType": "Table", - "keyClass": "foreignKey", - "keyTitle": "Foreign Key", - "name": "<\/i>role", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "'USER'::text", - "comments": "" - }, - { - "tableName": "organizations_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "urls", - "type": "jsonb", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, { "tableName": "organizations_info_view", "tableType": "View", @@ -456,63 +131,11 @@ "comments": "" }, { - "tableName": "oa_duplicates_view", + "tableName": "organizations_view", "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "oa_acronym", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "ec_researchorganization", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "oa_collectedfrom", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "ec_smevalidated", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "oa_other_ids", + "name": "other_names", "type": "jsonb", "length": 2147483647, "nullable": "√", @@ -521,63 +144,11 @@ "comments": "" }, { - "tableName": "tmp_dedup_events", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "group_id", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "conflict_groups_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "type_1", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_simple_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "country", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_info_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "n_duplicates", - "type": "int8", - "length": 19, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates", + "tableName": "relationships", "tableType": "Table", "keyClass": "primaryKey", "keyTitle": "Primary Key", - "name": "<\/i>local_id", + "name": "<\/i>id2", "type": "text", "length": 2147483647, "nullable": "", @@ -585,32 +156,6 @@ "defaultValue": "null", "comments": "" }, - { - "tableName": "journal", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "description", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "lat", - "type": "float8", - "length": 17, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, { "tableName": "organizations", "tableType": "Table", @@ -624,11 +169,180 @@ "defaultValue": "'UNKNOWN'::text", "comments": "" }, + { + "tableName": "organizations_simple_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "status", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "conflict_groups_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "id_1", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "user_roles", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>role", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "org_types", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>val", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "tmp_dedup_events", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_nonprofit", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "notes", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "note", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "tmp_dedup_events", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "oa_name", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "other_ids", + "type": "jsonb", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "other_ids", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>type", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_info_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "modification_date", + "type": "timestamptz", + "length": 35, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "tmp_dedup_events", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_researchorganization", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "reltype", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "'suggested'::text", + "comments": "" + }, { "tableName": "organizations", "tableType": "Table", "keyClass": "", "keyTitle": "", + "name": "ec_highereducation", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", "name": "ec_enterprise", "type": "bool", "length": 1, @@ -637,6 +351,45 @@ "defaultValue": "null", "comments": "" }, + { + "tableName": "organizations_simple_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "acronyms", + "type": "_text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "lat", + "type": "float8", + "length": 17, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "ec_internationalorganizationeurinterests", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, { "tableName": "organizations_simple_view", "tableType": "View", @@ -651,206 +404,11 @@ "comments": "" }, { - "tableName": "organizations_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "relations", - "type": "jsonb", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "relationships", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>id1", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "ec_legalbody", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "tmp_dedup_events", + "tableName": "journal", "tableType": "Table", "keyClass": "", "keyTitle": "", - "name": "ec_legalbody", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "org_types", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "name", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "modified_by", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_simple_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "urls", - "type": "_text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "tmp_dedup_events", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "pid_list", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "lat", - "type": "float8", - "length": 17, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "users", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>email", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_simple_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "name", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "conflict_groups_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "type_2", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "oa_original_id", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "ec_nutscode", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "created_by", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "created_by", + "name": "description", "type": "text", "length": 2147483647, "nullable": "√", @@ -872,11 +430,50 @@ "comments": "" }, { - "tableName": "organizations_info_view", + "tableName": "oa_duplicates_view", "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "note", + "name": "oa_url", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_simple_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "type", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "creation_date", + "type": "timestamptz", + "length": 35, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "now()", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_nutscode", "type": "bool", "length": 1, "nullable": "√", @@ -884,25 +481,77 @@ "defaultValue": "null", "comments": "" }, + { + "tableName": "notes", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>id", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "country", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "user_countries", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>email", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, { "tableName": "tmp_dedup_events", "tableType": "Table", "keyClass": "", "keyTitle": "", - "name": "ec_nonprofit", - "type": "bool", - "length": 1, + "name": "oa_url", + "type": "text", + "length": 2147483647, "nullable": "√", "autoUpdated": "", "defaultValue": "null", "comments": "" }, { - "tableName": "duplicate_groups_view", + "tableName": "conflict_groups_view", "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "name", + "name": "name_1", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "conflict_groups_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "country_1", "type": "text", "length": 2147483647, "nullable": "√", @@ -915,8 +564,21 @@ "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "acronyms", - "type": "jsonb", + "name": "ec_nutscode", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "created_by", + "type": "text", "length": 2147483647, "nullable": "√", "autoUpdated": "", @@ -924,11 +586,11 @@ "comments": "" }, { - "tableName": "other_names", + "tableName": "org_index_search", "tableType": "Table", "keyClass": "primaryKey", "keyTitle": "Primary Key", - "name": "<\/i>name", + "name": "<\/i>id", "type": "text", "length": 2147483647, "nullable": "", @@ -941,19 +603,6 @@ "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "ec_legalbody", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "tmp_dedup_events", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", "name": "ec_internationalorganization", "type": "bool", "length": 1, @@ -963,10 +612,23 @@ "comments": "" }, { - "tableName": "organizations_info_view", + "tableName": "organizations_view", "tableType": "View", "keyClass": "", "keyTitle": "", + "name": "city", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", "name": "modified_by", "type": "text", "length": 2147483647, @@ -976,24 +638,11 @@ "comments": "" }, { - "tableName": "relationships", + "tableName": "other_names", "tableType": "Table", "keyClass": "primaryKey", "keyTitle": "Primary Key", - "name": "<\/i>reltype", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "org_types", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>val", + "name": "<\/i>lang", "type": "text", "length": 2147483647, "nullable": "", @@ -1006,22 +655,9 @@ "tableType": "Table", "keyClass": "", "keyTitle": "", - "name": "ec_internationalorganizationeurinterests", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "users_view", - "tableType": "View", - "keyClass": "foreignKey", - "keyTitle": "Foreign Key", - "name": "<\/i>email", - "type": "text", - "length": 2147483647, + "name": "lng", + "type": "float8", + "length": 17, "nullable": "√", "autoUpdated": "", "defaultValue": "null", @@ -1032,7 +668,7 @@ "tableType": "Table", "keyClass": "", "keyTitle": "", - "name": "oa_collectedfrom", + "name": "local_id", "type": "text", "length": 2147483647, "nullable": "√", @@ -1040,6 +676,110 @@ "defaultValue": "null", "comments": "" }, + { + "tableName": "organizations_simple_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "n_similar_dups", + "type": "int8", + "length": 19, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "tmp_dedup_events", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_legalbody", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_conflicts", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "modified_by", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "duplicate_groups_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "country", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "ec_legalperson", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "relationships", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>id1", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_conflicts", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "creation_date", + "type": "timestamp", + "length": 29, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "now()", + "comments": "" + }, + { + "tableName": "organizations_info_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "n_conflicts", + "type": "int8", + "length": 19, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, { "tableName": "organizations", "tableType": "Table", @@ -1054,24 +794,11 @@ "comments": "" }, { - "tableName": "oa_conflicts", - "tableType": "Table", - "keyClass": "indexedColumn", - "keyTitle": "Indexed", - "name": "<\/i>idgroup", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations", - "tableType": "Table", + "tableName": "organizations_view", + "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "ec_researchorganization", + "name": "ec_internationalorganizationeurinterests", "type": "bool", "length": 1, "nullable": "√", @@ -1080,11 +807,24 @@ "comments": "" }, { - "tableName": "other_ids", + "tableName": "tmp_dedup_events", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_enterprise", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "relationships", "tableType": "Table", "keyClass": "primaryKey", "keyTitle": "Primary Key", - "name": "<\/i>id", + "name": "<\/i>reltype", "type": "text", "length": 2147483647, "nullable": "", @@ -1093,11 +833,37 @@ "comments": "" }, { - "tableName": "organizations", + "tableName": "organizations_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "ec_nonprofit", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "journal", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>jid", + "type": "serial", + "length": 10, + "nullable": "", + "autoUpdated": "√", + "defaultValue": "nextval('journal_jid_seq'::regclass)", + "comments": "" + }, + { + "tableName": "tmp_dedup_events", "tableType": "Table", "keyClass": "", "keyTitle": "", - "name": "created_by", + "name": "oa_collectedfrom", "type": "text", "length": 2147483647, "nullable": "√", @@ -1110,7 +876,7 @@ "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "ec_nonprofit", + "name": "ec_smevalidated", "type": "bool", "length": 1, "nullable": "√", @@ -1136,46 +902,46 @@ "tableType": "Table", "keyClass": "", "keyTitle": "", - "name": "oa_url", - "type": "text", - "length": 2147483647, + "name": "ec_smevalidated", + "type": "bool", + "length": 1, "nullable": "√", "autoUpdated": "", "defaultValue": "null", "comments": "" }, - { - "tableName": "journal", - "tableType": "Table", - "keyClass": "foreignKey", - "keyTitle": "Foreign Key", - "name": "<\/i>id", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "acronyms", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>id", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, { "tableName": "organizations", "tableType": "Table", "keyClass": "", "keyTitle": "", - "name": "ec_nutscode", + "name": "city", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "oa_original_id", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "tmp_dedup_events", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_legalperson", "type": "bool", "length": 1, "nullable": "√", @@ -1183,12 +949,38 @@ "defaultValue": "null", "comments": "" }, + { + "tableName": "oa_duplicates_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "reltype", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, { "tableName": "oa_conflicts", "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "modification_date", + "type": "timestamp", + "length": 29, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "now()", + "comments": "" + }, + { + "tableName": "other_names", + "tableType": "Table", "keyClass": "primaryKey", "keyTitle": "Primary Key", - "name": "<\/i>id1", + "name": "<\/i>id", "type": "text", "length": 2147483647, "nullable": "", @@ -1196,6 +988,45 @@ "defaultValue": "null", "comments": "" }, + { + "tableName": "organizations_simple_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "candidate_dup", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "org_types", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "name", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_internationalorganizationeurinterests", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, { "tableName": "organizations_view", "tableType": "View", @@ -1210,11 +1041,24 @@ "comments": "" }, { - "tableName": "user_countries", + "tableName": "urls", "tableType": "Table", "keyClass": "primaryKey", "keyTitle": "Primary Key", - "name": "<\/i>country", + "name": "<\/i>id", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "id_types", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>val", "type": "text", "length": 2147483647, "nullable": "", @@ -1227,7 +1071,33 @@ "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "ec_highereducation", + "name": "oa_collectedfrom", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "journal", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "op_date", + "type": "timestamp", + "length": 29, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "now()", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_nonprofit", "type": "bool", "length": 1, "nullable": "√", @@ -1236,39 +1106,13 @@ "comments": "" }, { - "tableName": "users_view", + "tableName": "duplicate_groups_view", "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "countries", - "type": "_text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "countries", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "name", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "tmp_dedup_events", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "oa_original_id", - "type": "text", - "length": 2147483647, + "name": "n_duplicates", + "type": "int8", + "length": 19, "nullable": "√", "autoUpdated": "", "defaultValue": "null", @@ -1287,164 +1131,21 @@ "defaultValue": "null", "comments": "" }, - { - "tableName": "duplicate_groups_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "city", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "tmp_dedup_events", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "oa_name", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "lng", - "type": "float8", - "length": 17, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "city", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "ec_internationalorganizationeurinterests", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "ec_nonprofit", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "suggestions_info_by_country_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "n_pending_orgs", - "type": "int8", - "length": 19, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "users_view", - "tableType": "View", - "keyClass": "foreignKey", - "keyTitle": "Foreign Key", - "name": "<\/i>role", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "other_names", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>id", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "conflict_groups_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "city_2", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_info_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "id", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, { "tableName": "oa_conflicts", "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "creation_date", - "type": "timestamp", - "length": 29, + "keyClass": "indexedColumn", + "keyTitle": "Indexed", + "name": "<\/i>idgroup", + "type": "text", + "length": 2147483647, "nullable": "√", "autoUpdated": "", - "defaultValue": "now()", + "defaultValue": "null", "comments": "" }, { - "tableName": "id_types", + "tableName": "languages", "tableType": "Table", "keyClass": "primaryKey", "keyTitle": "Primary Key", @@ -1470,63 +1171,11 @@ "comments": "" }, { - "tableName": "id_types", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "name", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "oa_country", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "ec_legalperson", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "tmp_dedup_events", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "ec_smevalidated", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "other_ids", + "tableName": "oa_duplicates", "tableType": "Table", "keyClass": "primaryKey", "keyTitle": "Primary Key", - "name": "<\/i>type", + "name": "<\/i>oa_original_id", "type": "text", "length": 2147483647, "nullable": "", @@ -1534,38 +1183,12 @@ "defaultValue": "null", "comments": "" }, - { - "tableName": "notes", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "note", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "status", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "'suggested'::text", - "comments": "" - }, { "tableName": "user_countries", "tableType": "Table", "keyClass": "primaryKey", "keyTitle": "Primary Key", - "name": "<\/i>email", + "name": "<\/i>country", "type": "text", "length": 2147483647, "nullable": "", @@ -1578,7 +1201,7 @@ "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "n_conflicts", + "name": "n_pending_orgs", "type": "int8", "length": 19, "nullable": "√", @@ -1587,179 +1210,10 @@ "comments": "" }, { - "tableName": "conflict_groups_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "idgroup", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "reltype", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "conflict_groups_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "id_1", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "ec_researchorganization", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_simple_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "status", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "tmp_dedup_events", + "tableName": "oa_conflicts", "tableType": "Table", "keyClass": "", "keyTitle": "", - "name": "oa_country", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "duplicate_groups_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "country", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "duplicate_groups_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "n_duplicates", - "type": "int8", - "length": 19, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "languages", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "name", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "urls", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>id", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "other_ids", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>otherid", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "id", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "conflict_groups_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "name_1", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_info_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", "name": "created_by", "type": "text", "length": 2147483647, @@ -1782,29 +1236,68 @@ "comments": "" }, { - "tableName": "oa_duplicates", - "tableType": "Table", + "tableName": "suggestions_info_by_country_view", + "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "modification_date", - "type": "timestamp", - "length": 29, + "name": "code", + "type": "text", + "length": 2147483647, "nullable": "√", "autoUpdated": "", - "defaultValue": "now()", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "users_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "last_access", + "type": "timestamptz", + "length": 35, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", "comments": "" }, { "tableName": "journal", "tableType": "Table", + "keyClass": "foreignKey", + "keyTitle": "Foreign Key", + "name": "<\/i>id", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_conflicts", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "reltype", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "'suggested'::text", + "comments": "" + }, + { + "tableName": "oa_conflicts", + "tableType": "Table", "keyClass": "primaryKey", "keyTitle": "Primary Key", - "name": "<\/i>jid", - "type": "serial", - "length": 10, + "name": "<\/i>id2", + "type": "text", + "length": 2147483647, "nullable": "", - "autoUpdated": "√", - "defaultValue": "nextval('journal_jid_seq'::regclass)", + "autoUpdated": "", + "defaultValue": "null", "comments": "" }, { @@ -1812,61 +1305,9 @@ "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "name", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_duplicates", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "creation_date", - "type": "timestamp", - "length": 29, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "now()", - "comments": "" - }, - { - "tableName": "oa_duplicates_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "oa_url", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_simple_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "type", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_simple_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "acronyms", - "type": "_text", - "length": 2147483647, + "name": "lat", + "type": "float8", + "length": 17, "nullable": "√", "autoUpdated": "", "defaultValue": "null", @@ -1877,47 +1318,47 @@ "tableType": "Table", "keyClass": "", "keyTitle": "", - "name": "ec_internationalorganization", - "type": "bool", - "length": 1, - "nullable": "√", + "name": "status", + "type": "text", + "length": 2147483647, + "nullable": "", "autoUpdated": "", - "defaultValue": "null", + "defaultValue": "'suggested'::text", "comments": "" }, { - "tableName": "oa_duplicates_view", + "tableName": "suggestions_info_by_country_view", "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "oa_name", - "type": "text", - "length": 2147483647, + "name": "n_conflicts", + "type": "int8", + "length": 19, "nullable": "√", "autoUpdated": "", "defaultValue": "null", "comments": "" }, { - "tableName": "tmp_dedup_events", - "tableType": "Table", + "tableName": "organizations_simple_view", + "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "ec_enterprise", - "type": "bool", - "length": 1, + "name": "n_different_dups", + "type": "int8", + "length": 19, "nullable": "√", "autoUpdated": "", "defaultValue": "null", "comments": "" }, { - "tableName": "org_index_search", - "tableType": "Table", - "keyClass": "indexedColumn", - "keyTitle": "Indexed", - "name": "<\/i>txt", - "type": "tsvector", + "tableName": "conflict_groups_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "name_2", + "type": "text", "length": 2147483647, "nullable": "√", "autoUpdated": "", @@ -1938,11 +1379,11 @@ "comments": "" }, { - "tableName": "tmp_dedup_events", - "tableType": "Table", + "tableName": "organizations_view", + "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "local_id", + "name": "status", "type": "text", "length": 2147483647, "nullable": "√", @@ -1951,11 +1392,11 @@ "comments": "" }, { - "tableName": "oa_duplicates_view", + "tableName": "users_view", "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "ec_internationalorganization", + "name": "valid", "type": "bool", "length": 1, "nullable": "√", @@ -1964,16 +1405,81 @@ "comments": "" }, { - "tableName": "journal", + "tableName": "users", + "tableType": "Table", + "keyClass": "foreignKey", + "keyTitle": "Foreign Key", + "name": "<\/i>role", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "'USER'::text", + "comments": "" + }, + { + "tableName": "urls", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>url", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "users", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>email", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "ec_researchorganization", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_info_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "id", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "users", "tableType": "Table", "keyClass": "", "keyTitle": "", - "name": "op_date", - "type": "timestamp", - "length": 29, + "name": "valid", + "type": "bool", + "length": 1, "nullable": "√", "autoUpdated": "", - "defaultValue": "now()", + "defaultValue": "true", "comments": "" }, { @@ -1989,25 +1495,12 @@ "defaultValue": "null", "comments": "" }, - { - "tableName": "oa_duplicates_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "oa_collectedfrom", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, { "tableName": "organizations_view", "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "ec_enterprise", + "name": "ec_smevalidated", "type": "bool", "length": 1, "nullable": "√", @@ -2016,13 +1509,143 @@ "comments": "" }, { - "tableName": "organizations_view", + "tableName": "tmp_dedup_events", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "oa_original_id", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_info_view", "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "other_names", - "type": "jsonb", + "name": "n_duplicates", + "type": "int8", + "length": 19, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "acronyms", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>id", + "type": "text", "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "name", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_internationalorganization", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "duplicate_groups_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "city", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "ec_researchorganization", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_simple_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "city", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "oa_name", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "ec_nonprofit", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "ec_legalbody", + "type": "bool", + "length": 1, "nullable": "√", "autoUpdated": "", "defaultValue": "null", @@ -2031,14 +1654,40 @@ { "tableName": "oa_conflicts", "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "reltype", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>id1", "type": "text", "length": 2147483647, "nullable": "", "autoUpdated": "", - "defaultValue": "'suggested'::text", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "users_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "countries", + "type": "_text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "creation_date", + "type": "timestamp", + "length": 29, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "now()", "comments": "" }, { @@ -2068,141 +1717,11 @@ "comments": "" }, { - "tableName": "users_view", + "tableName": "oa_duplicates_view", "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "valid", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "conflict_groups_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "name_2", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "tmp_dedup_events", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "ec_legalperson", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "ec_highereducation", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_info_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "name", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "org_index_search", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>id", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "relationships", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>id2", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "creation_date", - "type": "timestamptz", - "length": 35, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "now()", - "comments": "" - }, - { - "tableName": "organizations", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "ec_legalperson", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "users", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", - "name": "valid", - "type": "bool", - "length": 1, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "true", - "comments": "" - }, - { - "tableName": "suggestions_info_by_country_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "code", + "name": "oa_country", "type": "text", "length": 2147483647, "nullable": "√", @@ -2215,7 +1734,20 @@ "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "city", + "name": "ec_legalperson", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "oa_acronym", "type": "text", "length": 2147483647, "nullable": "√", @@ -2228,7 +1760,7 @@ "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "country_1", + "name": "type_2", "type": "text", "length": 2147483647, "nullable": "√", @@ -2237,23 +1769,10 @@ "comments": "" }, { - "tableName": "suggestions_info_by_country_view", + "tableName": "organizations_info_view", "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "name", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "oa_conflicts", - "tableType": "Table", - "keyClass": "", - "keyTitle": "", "name": "modified_by", "type": "text", "length": 2147483647, @@ -2262,12 +1781,25 @@ "defaultValue": "null", "comments": "" }, + { + "tableName": "notes", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "modification_date", + "type": "timestamp", + "length": 29, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, { "tableName": "organizations_view", "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "ec_smevalidated", + "name": "ec_highereducation", "type": "bool", "length": 1, "nullable": "√", @@ -2275,84 +1807,6 @@ "defaultValue": "null", "comments": "" }, - { - "tableName": "organizations_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "status", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_info_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "modification_date", - "type": "timestamptz", - "length": 35, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations_simple_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "city", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "conflict_groups_view", - "tableType": "View", - "keyClass": "", - "keyTitle": "", - "name": "id_2", - "type": "text", - "length": 2147483647, - "nullable": "√", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "notes", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>id", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "", - "defaultValue": "null", - "comments": "" - }, - { - "tableName": "organizations", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>id", - "type": "text", - "length": 2147483647, - "nullable": "", - "autoUpdated": "√", - "defaultValue": "('openorgs____::'::text || lpad((nextval('organizations_id_seq'::regclass))::text, 10, '0'::text))", - "comments": "" - }, { "tableName": "acronyms", "tableType": "Table", @@ -2367,24 +1821,24 @@ "comments": "" }, { - "tableName": "users_view", + "tableName": "organizations_simple_view", "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "first_access", - "type": "timestamptz", - "length": 35, + "name": "urls", + "type": "_text", + "length": 2147483647, "nullable": "√", "autoUpdated": "", "defaultValue": "null", "comments": "" }, { - "tableName": "organizations", + "tableName": "notes", "tableType": "Table", - "keyClass": "foreignKey", - "keyTitle": "Foreign Key", - "name": "<\/i>country", + "keyClass": "", + "keyTitle": "", + "name": "modified_by", "type": "text", "length": 2147483647, "nullable": "√", @@ -2392,6 +1846,32 @@ "defaultValue": "null", "comments": "" }, + { + "tableName": "organizations_simple_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "name", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "oa_other_ids", + "type": "jsonb", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, { "tableName": "organizations_view", "tableType": "View", @@ -2406,11 +1886,24 @@ "comments": "" }, { - "tableName": "organizations_view", - "tableType": "View", + "tableName": "other_names", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>name", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "tmp_dedup_events", + "tableType": "Table", "keyClass": "", "keyTitle": "", - "name": "ec_legalperson", + "name": "ec_nutscode", "type": "bool", "length": 1, "nullable": "√", @@ -2419,7 +1912,150 @@ "comments": "" }, { - "tableName": "organizations_view", + "tableName": "oa_duplicates", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "modified_by", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_enterprise", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "tmp_dedup_events", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "pid_list", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_info_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "note", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "org_index_search", + "tableType": "Table", + "keyClass": "indexedColumn", + "keyTitle": "Indexed", + "name": "<\/i>txt", + "type": "tsvector", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "countries", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "name", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "languages", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "name", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>local_id", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "users_view", + "tableType": "View", + "keyClass": "foreignKey", + "keyTitle": "Foreign Key", + "name": "<\/i>email", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "tmp_dedup_events", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "oa_acronym", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "id_types", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "name", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_simple_view", "tableType": "View", "keyClass": "", "keyTitle": "", @@ -2432,13 +2068,78 @@ "comments": "" }, { - "tableName": "users_view", + "tableName": "oa_duplicates", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "modification_date", + "type": "timestamp", + "length": 29, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "now()", + "comments": "" + }, + { + "tableName": "organizations_view", "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "last_access", - "type": "timestamptz", - "length": 35, + "name": "urls", + "type": "jsonb", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "foreignKey", + "keyTitle": "Foreign Key", + "name": "<\/i>country", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_simple_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "n_suggested_dups", + "type": "int8", + "length": 19, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_researchorganization", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "conflict_groups_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "idgroup", + "type": "text", + "length": 2147483647, "nullable": "√", "autoUpdated": "", "defaultValue": "null", @@ -2449,7 +2150,267 @@ "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "ec_enterprise", + "name": "ec_nutscode", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_smevalidated", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "suggestions_info_by_country_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "name", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "created_by", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "relations", + "type": "jsonb", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_info_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "created_by", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "ec_legalbody", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "conflict_groups_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "city_1", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "other_ids", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>otherid", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "conflict_groups_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "type_1", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "acronyms", + "type": "jsonb", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "conflict_groups_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "id_2", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "tmp_dedup_events", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_internationalorganization", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "duplicate_groups_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "name", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "id", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>id", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "√", + "defaultValue": "('openorgs____::'::text || lpad((nextval('organizations_id_seq'::regclass))::text, 10, '0'::text))", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "created_by", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "oa_collectedfrom", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "name", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "users_view", + "tableType": "View", + "keyClass": "foreignKey", + "keyTitle": "Foreign Key", + "name": "<\/i>role", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "organizations", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_legalperson", "type": "bool", "length": 1, "nullable": "√", @@ -2471,27 +2432,40 @@ "comments": "" }, { - "tableName": "oa_conflicts", - "tableType": "Table", + "tableName": "oa_duplicates_view", + "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "modification_date", - "type": "timestamp", - "length": 29, + "name": "ec_highereducation", + "type": "bool", + "length": 1, "nullable": "√", "autoUpdated": "", - "defaultValue": "now()", + "defaultValue": "null", "comments": "" }, { - "tableName": "other_names", - "tableType": "Table", - "keyClass": "primaryKey", - "keyTitle": "Primary Key", - "name": "<\/i>lang", - "type": "text", - "length": 2147483647, - "nullable": "", + "tableName": "oa_duplicates_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "ec_enterprise", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "users_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "first_access", + "type": "timestamptz", + "length": 35, + "nullable": "√", "autoUpdated": "", "defaultValue": "null", "comments": "" @@ -2501,9 +2475,87 @@ "tableType": "View", "keyClass": "", "keyTitle": "", - "name": "n_conflicts", - "type": "int8", - "length": 19, + "name": "name", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "oa_duplicates_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "local_id", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "tmp_dedup_events", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "ec_highereducation", + "type": "bool", + "length": 1, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "tmp_dedup_events", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "group_id", + "type": "text", + "length": 2147483647, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "other_ids", + "tableType": "Table", + "keyClass": "primaryKey", + "keyTitle": "Primary Key", + "name": "<\/i>id", + "type": "text", + "length": 2147483647, + "nullable": "", + "autoUpdated": "", + "defaultValue": "null", + "comments": "" + }, + { + "tableName": "users", + "tableType": "Table", + "keyClass": "", + "keyTitle": "", + "name": "last_access", + "type": "timestamptz", + "length": 35, + "nullable": "√", + "autoUpdated": "", + "defaultValue": "now()", + "comments": "" + }, + { + "tableName": "conflict_groups_view", + "tableType": "View", + "keyClass": "", + "keyTitle": "", + "name": "city_2", + "type": "text", + "length": 2147483647, "nullable": "√", "autoUpdated": "", "defaultValue": "null", diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.dot index 01c448cc..ae793575 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.dot @@ -22,7 +22,7 @@ digraph "org_index_search" {
org_index_search[table]
id
text[2147483647]
txt
tsvector[2147483647] - < 0497.619 rows0 > + < 0497.675 rows0 > > URL="../../tables/org_index_search.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.svg index 08658f83..b88cc7ab 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/org_index_search.1degree.svg @@ -33,7 +33,7 @@ < 0 -497.619 rows +497.675 rows 0 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.dot index ab11d4b0..9ec3b4e4 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.dot @@ -39,7 +39,7 @@ digraph "tmp_dedup_events" {
oa_original_id
text[2147483647]
oa_url
text[2147483647]
pid_list
text[2147483647] - < 0236.350 rows0 > + < 0236.394 rows0 > > URL="../../tables/tmp_dedup_events.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.svg index ab377a24..1b3964e4 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/orphans/tmp_dedup_events.1degree.svg @@ -99,7 +99,7 @@ < 0 -236.350 rows +236.394 rows 0 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.dot index 6922b4aa..e8b81b24 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.dot @@ -24,7 +24,7 @@ digraph "compactImpliedRelationshipsDiagram" {
acronyms[table]
id
acronym
- < 1143.307 rows + < 1143.341 rows > URL="../../tables/acronyms.html" target="_top" @@ -62,7 +62,7 @@ digraph "compactImpliedRelationshipsDiagram" {
id
email
... - < 1320 rows + < 1336 rows > URL="../../tables/journal.html" target="_top" @@ -113,7 +113,7 @@ digraph "compactImpliedRelationshipsDiagram" {
local_id
oa_original_id
... - < 2219.046 rows + < 2219.113 rows > URL="../../tables/oa_duplicates.html" target="_top" @@ -139,7 +139,7 @@ digraph "compactImpliedRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -152,7 +152,7 @@ digraph "compactImpliedRelationshipsDiagram" {
id
otherid
type
- < 2361.455 rows + < 2344.848 rows > URL="../../tables/other_ids.html" target="_top" @@ -190,7 +190,7 @@ digraph "compactImpliedRelationshipsDiagram" {
urls[table]
id
url
- < 1216.098 rows + < 1216.223 rows > URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.svg index e47aedb6..1da30187 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.compact.svg @@ -30,7 +30,7 @@ < 1 -143.307 rows +143.341 rows   @@ -64,7 +64,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -156,7 +156,7 @@ < 1 -320 rows +336 rows   @@ -334,7 +334,7 @@ < 2 -219.046 rows +219.113 rows   @@ -418,7 +418,7 @@ < 2 -361.455 rows +344.848 rows   @@ -547,7 +547,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.dot index d363147b..299a6d7c 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.dot @@ -24,7 +24,7 @@ digraph "largeImpliedRelationshipsDiagram" {
acronyms[table]
id
acronym
- < 1143.307 rows + < 1143.341 rows > URL="../../tables/acronyms.html" target="_top" @@ -64,7 +64,7 @@ digraph "largeImpliedRelationshipsDiagram" {
description
op_date
email
- < 1320 rows + < 1336 rows > URL="../../tables/journal.html" target="_top" @@ -126,7 +126,7 @@ digraph "largeImpliedRelationshipsDiagram" {
modification_date
modified_by
created_by
- < 2219.046 rows + < 2219.113 rows > URL="../../tables/oa_duplicates.html" target="_top" @@ -170,7 +170,7 @@ digraph "largeImpliedRelationshipsDiagram" {
ec_enterprise
ec_smevalidated
ec_nutscode
- < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -183,7 +183,7 @@ digraph "largeImpliedRelationshipsDiagram" {
id
otherid
type
- < 2361.455 rows + < 2344.848 rows > URL="../../tables/other_ids.html" target="_top" @@ -221,7 +221,7 @@ digraph "largeImpliedRelationshipsDiagram" {
urls[table]
id
url
- < 1216.098 rows + < 1216.223 rows > URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.svg index cda63894..bd19b544 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.implied.large.svg @@ -30,7 +30,7 @@ < 1 -143.307 rows +143.341 rows   @@ -100,7 +100,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -196,7 +196,7 @@ < 1 -320 rows +336 rows   @@ -400,7 +400,7 @@ < 2 -219.046 rows +219.113 rows   @@ -484,7 +484,7 @@ < 2 -361.455 rows +344.848 rows   @@ -613,7 +613,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.dot index 4e2228db..d4a6287c 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.dot @@ -24,7 +24,7 @@ digraph "compactRelationshipsDiagram" {
acronyms[table]
id
acronym
- < 1143.307 rows + < 1143.341 rows > URL="../../tables/acronyms.html" target="_top" @@ -61,7 +61,7 @@ digraph "compactRelationshipsDiagram" {
jid
id
... - < 1320 rows + < 1336 rows > URL="../../tables/journal.html" target="_top" @@ -112,7 +112,7 @@ digraph "compactRelationshipsDiagram" {
local_id
oa_original_id
... - < 2219.046 rows + < 2219.113 rows > URL="../../tables/oa_duplicates.html" target="_top" @@ -138,7 +138,7 @@ digraph "compactRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -151,7 +151,7 @@ digraph "compactRelationshipsDiagram" {
id
otherid
type
- < 2361.455 rows + < 2344.848 rows > URL="../../tables/other_ids.html" target="_top" @@ -189,7 +189,7 @@ digraph "compactRelationshipsDiagram" {
urls[table]
id
url
- < 1216.098 rows + < 1216.223 rows > URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.svg index d6945fa1..7b5515bc 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.compact.svg @@ -30,7 +30,7 @@ < 1 -143.307 rows +143.341 rows   @@ -64,7 +64,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -153,7 +153,7 @@ < 1 -320 rows +336 rows   @@ -295,7 +295,7 @@ < 2 -219.046 rows +219.113 rows   @@ -379,7 +379,7 @@ < 2 -361.455 rows +344.848 rows   @@ -508,7 +508,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.dot index 4b709811..f0bb230d 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.dot @@ -24,7 +24,7 @@ digraph "largeRelationshipsDiagram" {
acronyms[table]
id
acronym
- < 1143.307 rows + < 1143.341 rows > URL="../../tables/acronyms.html" target="_top" @@ -64,7 +64,7 @@ digraph "largeRelationshipsDiagram" {
description
op_date
email
- < 1320 rows + < 1336 rows > URL="../../tables/journal.html" target="_top" @@ -126,7 +126,7 @@ digraph "largeRelationshipsDiagram" {
modification_date
modified_by
created_by
- < 2219.046 rows + < 2219.113 rows > URL="../../tables/oa_duplicates.html" target="_top" @@ -170,7 +170,7 @@ digraph "largeRelationshipsDiagram" {
ec_enterprise
ec_smevalidated
ec_nutscode
- < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -183,7 +183,7 @@ digraph "largeRelationshipsDiagram" {
id
otherid
type
- < 2361.455 rows + < 2344.848 rows > URL="../../tables/other_ids.html" target="_top" @@ -221,7 +221,7 @@ digraph "largeRelationshipsDiagram" {
urls[table]
id
url
- < 1216.098 rows + < 1216.223 rows > URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.svg index 7baf0048..15a718a0 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/summary/relationships.real.large.svg @@ -30,7 +30,7 @@ < 1 -143.307 rows +143.341 rows   @@ -100,7 +100,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -195,7 +195,7 @@ < 1 -320 rows +336 rows   @@ -359,7 +359,7 @@ < 2 -219.046 rows +219.113 rows   @@ -443,7 +443,7 @@ < 2 -361.455 rows +344.848 rows   @@ -572,7 +572,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.dot index 63644c91..d76e58d7 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.dot @@ -25,7 +25,7 @@ digraph "oneDegreeRelationshipsDiagram" {
acronyms[table]
id
text[2147483647]
acronym
text[2147483647] - < 1143.307 rows0 > + < 1143.341 rows0 > > URL="../../tables/acronyms.html" target="_top" @@ -39,7 +39,7 @@ digraph "oneDegreeRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.svg index 5bb45647..0b7d3578 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.1degree.svg @@ -34,7 +34,7 @@ < 1 -143.307 rows +143.341 rows 0 > @@ -69,7 +69,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.dot index e4a2c054..756e3f16 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.dot @@ -38,7 +38,7 @@ digraph "twoDegreesRelationshipsDiagram" {
acronyms[table]
id
text[2147483647]
acronym
text[2147483647] - < 1143.307 rows0 > + < 1143.341 rows0 > > URL="../../tables/acronyms.html" target="_top" @@ -60,7 +60,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
journal[table]
...
< 1320 rows
< 1336 rows
> URL="../../tables/journal.html" target="_top" @@ -93,7 +93,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
oa_duplicates[table]
...
< 2219.046 rows
< 2219.113 rows
> URL="../../tables/oa_duplicates.html" target="_top" @@ -118,7 +118,7 @@ digraph "twoDegreesRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -129,7 +129,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
other_ids[table]
...
< 2361.455 rows
< 2344.848 rows
> URL="../../tables/other_ids.html" target="_top" @@ -162,7 +162,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
urls[table]
...
< 1216.098 rows
< 1216.223 rows
> URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.svg index f8741e24..8ce0fa06 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/acronyms.2degrees.svg @@ -34,7 +34,7 @@ < 1 -143.307 rows +143.341 rows 0 > @@ -69,7 +69,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -159,7 +159,7 @@ < 1 -320 rows +336 rows   @@ -257,7 +257,7 @@ < 2 -219.046 rows +219.113 rows   @@ -294,7 +294,7 @@ < 2 -361.455 rows +344.848 rows   @@ -391,7 +391,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.dot index d2e63ee9..5d82c855 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.dot @@ -40,7 +40,7 @@ digraph "oneDegreeRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.svg index e034eabf..1f622980 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.1degree.svg @@ -37,7 +37,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.dot index b6c6e6d0..df91e034 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.dot @@ -39,7 +39,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
acronyms[table]
...
< 1143.307 rows
< 1143.341 rows
> URL="../../tables/acronyms.html" target="_top" @@ -62,7 +62,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
journal[table]
...
< 1320 rows
< 1336 rows
> URL="../../tables/journal.html" target="_top" @@ -95,7 +95,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
oa_duplicates[table]
...
< 2219.046 rows
< 2219.113 rows
> URL="../../tables/oa_duplicates.html" target="_top" @@ -120,7 +120,7 @@ digraph "twoDegreesRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -131,7 +131,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
other_ids[table]
...
< 2361.455 rows
< 2344.848 rows
> URL="../../tables/other_ids.html" target="_top" @@ -164,7 +164,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
urls[table]
...
< 1216.098 rows
< 1216.223 rows
> URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.svg index ce9dff41..42929069 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/countries.2degrees.svg @@ -26,7 +26,7 @@ < 1 -143.307 rows +143.341 rows   @@ -60,7 +60,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -158,7 +158,7 @@ < 1 -320 rows +336 rows   @@ -256,7 +256,7 @@ < 2 -219.046 rows +219.113 rows   @@ -293,7 +293,7 @@ < 2 -361.455 rows +344.848 rows   @@ -390,7 +390,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.dot index 6e5a629c..63e0e0d0 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.dot @@ -38,7 +38,7 @@ digraph "oneDegreeRelationshipsDiagram" {
id
otherid
type
- < 2361.455 rows + < 2344.848 rows > URL="../../tables/other_ids.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.svg index 2153b6d0..e3dd271f 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.1degree.svg @@ -33,7 +33,7 @@ < 2 -361.455 rows +344.848 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.dot index c6ebba62..e84f32a0 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.dot @@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
organizations[table]
...
< 2497.617 rows12 >
< 2497.673 rows12 >
> URL="../../tables/organizations.html" target="_top" @@ -50,7 +50,7 @@ digraph "twoDegreesRelationshipsDiagram" {
id
otherid
type
- < 2361.455 rows + < 2344.848 rows > URL="../../tables/other_ids.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.svg index c8c3055f..3d308987 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/id_types.2degrees.svg @@ -33,7 +33,7 @@ < 2 -361.455 rows +344.848 rows   @@ -56,7 +56,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.dot index ff402159..6d3b5c7d 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.dot @@ -29,7 +29,7 @@ digraph "oneDegreeRelationshipsDiagram" {
description
text[2147483647]
op_date
timestamp[29,6]
email
text[2147483647] - < 1320 rows0 > + < 1336 rows0 > > URL="../../tables/journal.html" target="_top" @@ -43,7 +43,7 @@ digraph "oneDegreeRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.svg index c14fdc5d..fee6cdac 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.1degree.svg @@ -52,7 +52,7 @@ < 1 -320 rows +336 rows 0 > @@ -87,7 +87,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.dot index 6d3deec2..bd90e3fc 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.dot @@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
acronyms[table]
...
< 1143.307 rows
< 1143.341 rows
> URL="../../tables/acronyms.html" target="_top" @@ -64,7 +64,7 @@ digraph "twoDegreesRelationshipsDiagram" {
description
text[2147483647]
op_date
timestamp[29,6]
email
text[2147483647] - < 1320 rows0 > + < 1336 rows0 > > URL="../../tables/journal.html" target="_top" @@ -97,7 +97,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
oa_duplicates[table]
...
< 2219.046 rows
< 2219.113 rows
> URL="../../tables/oa_duplicates.html" target="_top" @@ -122,7 +122,7 @@ digraph "twoDegreesRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -133,7 +133,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
other_ids[table]
...
< 2361.455 rows
< 2344.848 rows
> URL="../../tables/other_ids.html" target="_top" @@ -166,7 +166,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
urls[table]
...
< 1216.098 rows
< 1216.223 rows
> URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.svg index dc23713f..646ede54 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.2degrees.svg @@ -26,7 +26,7 @@ < 1 -143.307 rows +143.341 rows   @@ -60,7 +60,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -176,7 +176,7 @@ < 1 -320 rows +336 rows 0 > @@ -275,7 +275,7 @@ < 2 -219.046 rows +219.113 rows   @@ -312,7 +312,7 @@ < 2 -361.455 rows +344.848 rows   @@ -409,7 +409,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.dot index 06ef5072..4c52b621 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.dot @@ -30,7 +30,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
description
text[2147483647]
op_date
timestamp[29,6]
email
text[2147483647] - < 2320 rows0 > + < 2336 rows0 > > URL="../../tables/journal.html" target="_top" @@ -44,7 +44,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.svg index a64537eb..0c90c9e4 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied1degrees.svg @@ -52,7 +52,7 @@ < 2 -320 rows +336 rows 0 > @@ -123,7 +123,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.dot index 33dca174..ab8ca224 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.dot @@ -43,7 +43,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" { - +
acronyms[table]
...
< 1143.307 rows
< 1143.341 rows
> URL="../../tables/acronyms.html" target="_top" @@ -70,7 +70,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
description
text[2147483647]
op_date
timestamp[29,6]
email
text[2147483647] - < 2320 rows0 > + < 2336 rows0 > > URL="../../tables/journal.html" target="_top" @@ -103,7 +103,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" { - +
oa_duplicates[table]
...
< 2219.046 rows
< 2219.113 rows
> URL="../../tables/oa_duplicates.html" target="_top" @@ -128,7 +128,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -139,7 +139,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" { - +
other_ids[table]
...
< 2361.455 rows
< 2344.848 rows
> URL="../../tables/other_ids.html" target="_top" @@ -172,7 +172,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" { - +
urls[table]
...
< 1216.098 rows
< 1216.223 rows
> URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.svg index add97890..369a08f7 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/journal.implied2degrees.svg @@ -26,7 +26,7 @@ < 1 -143.307 rows +143.341 rows   @@ -60,7 +60,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -176,7 +176,7 @@ < 2 -320 rows +336 rows 0 > @@ -341,7 +341,7 @@ < 2 -219.046 rows +219.113 rows   @@ -378,7 +378,7 @@ < 2 -361.455 rows +344.848 rows   @@ -475,7 +475,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.dot index ec6b42bc..3f567092 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.dot @@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
organizations[table]
...
< 2497.617 rows12 >
< 2497.673 rows12 >
> URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.svg index e30ae086..531f52e0 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/languages.2degrees.svg @@ -56,7 +56,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.dot index 29545366..9786f971 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.dot @@ -41,7 +41,7 @@ digraph "oneDegreeRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.svg index e7e27a84..84122d89 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.1degree.svg @@ -76,7 +76,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.dot index 4b1bbc91..9849638d 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.dot @@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
acronyms[table]
...
< 1143.307 rows
< 1143.341 rows
> URL="../../tables/acronyms.html" target="_top" @@ -59,7 +59,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
journal[table]
...
< 1320 rows
< 1336 rows
> URL="../../tables/journal.html" target="_top" @@ -95,7 +95,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
oa_duplicates[table]
...
< 2219.046 rows
< 2219.113 rows
> URL="../../tables/oa_duplicates.html" target="_top" @@ -120,7 +120,7 @@ digraph "twoDegreesRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -131,7 +131,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
other_ids[table]
...
< 2361.455 rows
< 2344.848 rows
> URL="../../tables/other_ids.html" target="_top" @@ -164,7 +164,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
urls[table]
...
< 1216.098 rows
< 1216.223 rows
> URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.svg index 8ef2f3e2..29eb46bc 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/notes.2degrees.svg @@ -26,7 +26,7 @@ < 1 -143.307 rows +143.341 rows   @@ -60,7 +60,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -150,7 +150,7 @@ < 1 -320 rows +336 rows   @@ -264,7 +264,7 @@ < 2 -219.046 rows +219.113 rows   @@ -301,7 +301,7 @@ < 2 -361.455 rows +344.848 rows   @@ -398,7 +398,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.dot index e142f121..e206ce8f 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.dot @@ -46,7 +46,7 @@ digraph "oneDegreeRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.svg index 7efe9154..560a1938 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.1degree.svg @@ -94,7 +94,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.dot index 08165da8..35328015 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.dot @@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
acronyms[table]
...
< 1143.307 rows
< 1143.341 rows
> URL="../../tables/acronyms.html" target="_top" @@ -59,7 +59,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
journal[table]
...
< 1320 rows
< 1336 rows
> URL="../../tables/journal.html" target="_top" @@ -99,7 +99,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
oa_duplicates[table]
...
< 2219.046 rows
< 2219.113 rows
> URL="../../tables/oa_duplicates.html" target="_top" @@ -124,7 +124,7 @@ digraph "twoDegreesRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -135,7 +135,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
other_ids[table]
...
< 2361.455 rows
< 2344.848 rows
> URL="../../tables/other_ids.html" target="_top" @@ -168,7 +168,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
urls[table]
...
< 1216.098 rows
< 1216.223 rows
> URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.svg index e771f686..883d478a 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_conflicts.2degrees.svg @@ -26,7 +26,7 @@ < 1 -143.307 rows +143.341 rows   @@ -60,7 +60,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -150,7 +150,7 @@ < 1 -320 rows +336 rows   @@ -282,7 +282,7 @@ < 2 -219.046 rows +219.113 rows   @@ -319,7 +319,7 @@ < 2 -361.455 rows +344.848 rows   @@ -416,7 +416,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.dot index 7240455e..340c1f03 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.dot @@ -32,7 +32,7 @@ digraph "oneDegreeRelationshipsDiagram" {
modification_date
timestamp[29,6]
modified_by
text[2147483647]
created_by
text[2147483647] - < 2219.046 rows0 > + < 2219.113 rows0 > > URL="../../tables/oa_duplicates.html" target="_top" @@ -46,7 +46,7 @@ digraph "oneDegreeRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.svg index fedd80ea..9edb792c 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.1degree.svg @@ -58,7 +58,7 @@ < 2 -219.046 rows +219.113 rows 0 > @@ -93,7 +93,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.dot index 2083550a..2a98b50c 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.dot @@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
acronyms[table]
...
< 1143.307 rows
< 1143.341 rows
> URL="../../tables/acronyms.html" target="_top" @@ -59,7 +59,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
journal[table]
...
< 1320 rows
< 1336 rows
> URL="../../tables/journal.html" target="_top" @@ -99,7 +99,7 @@ digraph "twoDegreesRelationshipsDiagram" {
modification_date
timestamp[29,6]
modified_by
text[2147483647]
created_by
text[2147483647] - < 2219.046 rows0 > + < 2219.113 rows0 > > URL="../../tables/oa_duplicates.html" target="_top" @@ -124,7 +124,7 @@ digraph "twoDegreesRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -135,7 +135,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
other_ids[table]
...
< 2361.455 rows
< 2344.848 rows
> URL="../../tables/other_ids.html" target="_top" @@ -168,7 +168,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
urls[table]
...
< 1216.098 rows
< 1216.223 rows
> URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.svg index cd6c8091..ef7e369d 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/oa_duplicates.2degrees.svg @@ -26,7 +26,7 @@ < 1 -143.307 rows +143.341 rows   @@ -60,7 +60,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -150,7 +150,7 @@ < 1 -320 rows +336 rows   @@ -280,7 +280,7 @@ < 2 -219.046 rows +219.113 rows 0 > @@ -318,7 +318,7 @@ < 2 -361.455 rows +344.848 rows   @@ -415,7 +415,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.dot index e49a309e..23b765f5 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.dot @@ -39,7 +39,7 @@ digraph "oneDegreeRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.svg index ba668423..7e1f8727 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.1degree.svg @@ -37,7 +37,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.dot index 628301bd..f33545cd 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.dot @@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
acronyms[table]
...
< 1143.307 rows
< 1143.341 rows
> URL="../../tables/acronyms.html" target="_top" @@ -59,7 +59,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
journal[table]
...
< 1320 rows
< 1336 rows
> URL="../../tables/journal.html" target="_top" @@ -92,7 +92,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
oa_duplicates[table]
...
< 2219.046 rows
< 2219.113 rows
> URL="../../tables/oa_duplicates.html" target="_top" @@ -118,7 +118,7 @@ digraph "twoDegreesRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -129,7 +129,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
other_ids[table]
...
< 2361.455 rows
< 2344.848 rows
> URL="../../tables/other_ids.html" target="_top" @@ -162,7 +162,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
urls[table]
...
< 1216.098 rows
< 1216.223 rows
> URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.svg index f8306bde..f8a97246 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/org_types.2degrees.svg @@ -26,7 +26,7 @@ < 1 -143.307 rows +143.341 rows   @@ -60,7 +60,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -158,7 +158,7 @@ < 1 -320 rows +336 rows   @@ -256,7 +256,7 @@ < 2 -219.046 rows +219.113 rows   @@ -293,7 +293,7 @@ < 2 -361.455 rows +344.848 rows   @@ -390,7 +390,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.dot index 2e33dbc6..43033672 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.dot @@ -38,7 +38,7 @@ digraph "oneDegreeRelationshipsDiagram" {
acronyms[table]
id
acronym
- < 1143.307 rows + < 1143.341 rows > URL="../../tables/acronyms.html" target="_top" @@ -64,7 +64,7 @@ digraph "oneDegreeRelationshipsDiagram" {
id
email
... - < 1320 rows + < 1336 rows > URL="../../tables/journal.html" target="_top" @@ -103,7 +103,7 @@ digraph "oneDegreeRelationshipsDiagram" {
local_id
oa_original_id
... - < 2219.046 rows + < 2219.113 rows > URL="../../tables/oa_duplicates.html" target="_top" @@ -147,7 +147,7 @@ digraph "oneDegreeRelationshipsDiagram" {
ec_enterprise
bool[1]
ec_smevalidated
bool[1]
ec_nutscode
bool[1] - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -160,7 +160,7 @@ digraph "oneDegreeRelationshipsDiagram" {
id
otherid
type
- < 2361.455 rows + < 2344.848 rows > URL="../../tables/other_ids.html" target="_top" @@ -198,7 +198,7 @@ digraph "oneDegreeRelationshipsDiagram" {
urls[table]
id
url
- < 1216.098 rows + < 1216.223 rows > URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.svg index aacbbfc8..02a62c9a 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.1degree.svg @@ -30,7 +30,7 @@ < 1 -143.307 rows +143.341 rows   @@ -144,7 +144,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -251,7 +251,7 @@ < 1 -320 rows +336 rows   @@ -367,7 +367,7 @@ < 2 -219.046 rows +219.113 rows   @@ -411,7 +411,7 @@ < 2 -361.455 rows +344.848 rows   @@ -526,7 +526,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.dot index 8d3ccba5..9d0fcd94 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.dot @@ -41,7 +41,7 @@ digraph "twoDegreesRelationshipsDiagram" {
acronyms[table]
id
acronym
- < 1143.307 rows + < 1143.341 rows > URL="../../tables/acronyms.html" target="_top" @@ -78,7 +78,7 @@ digraph "twoDegreesRelationshipsDiagram" {
id
email
... - < 1320 rows + < 1336 rows > URL="../../tables/journal.html" target="_top" @@ -128,7 +128,7 @@ digraph "twoDegreesRelationshipsDiagram" {
local_id
oa_original_id
... - < 2219.046 rows + < 2219.113 rows > URL="../../tables/oa_duplicates.html" target="_top" @@ -172,7 +172,7 @@ digraph "twoDegreesRelationshipsDiagram" {
ec_enterprise
bool[1]
ec_smevalidated
bool[1]
ec_nutscode
bool[1] - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -185,7 +185,7 @@ digraph "twoDegreesRelationshipsDiagram" {
id
otherid
type
- < 2361.455 rows + < 2344.848 rows > URL="../../tables/other_ids.html" target="_top" @@ -223,7 +223,7 @@ digraph "twoDegreesRelationshipsDiagram" {
urls[table]
id
url
- < 1216.098 rows + < 1216.223 rows > URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.svg index 04179ab5..7e70cc23 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.2degrees.svg @@ -30,7 +30,7 @@ < 1 -143.307 rows +143.341 rows   @@ -144,7 +144,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -251,7 +251,7 @@ < 1 -320 rows +336 rows   @@ -367,7 +367,7 @@ < 2 -219.046 rows +219.113 rows   @@ -411,7 +411,7 @@ < 2 -361.455 rows +344.848 rows   @@ -586,7 +586,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.dot index 04e94ae6..24034db7 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.dot @@ -38,7 +38,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
acronyms[table]
id
acronym
- < 1143.307 rows + < 1143.341 rows > URL="../../tables/acronyms.html" target="_top" @@ -64,7 +64,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
id
email
... - < 1320 rows + < 1336 rows > URL="../../tables/journal.html" target="_top" @@ -103,7 +103,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
local_id
oa_original_id
... - < 2219.046 rows + < 2219.113 rows > URL="../../tables/oa_duplicates.html" target="_top" @@ -147,7 +147,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
ec_enterprise
bool[1]
ec_smevalidated
bool[1]
ec_nutscode
bool[1] - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -160,7 +160,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
id
otherid
type
- < 2361.455 rows + < 2344.848 rows > URL="../../tables/other_ids.html" target="_top" @@ -198,7 +198,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
urls[table]
id
url
- < 1216.098 rows + < 1216.223 rows > URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.svg index 23b191dd..8dabcec9 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied1degrees.svg @@ -30,7 +30,7 @@ < 1 -143.307 rows +143.341 rows   @@ -144,7 +144,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -251,7 +251,7 @@ < 1 -320 rows +336 rows   @@ -367,7 +367,7 @@ < 2 -219.046 rows +219.113 rows   @@ -411,7 +411,7 @@ < 2 -361.455 rows +344.848 rows   @@ -526,7 +526,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.dot index 414452a8..bfb156b2 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.dot @@ -43,7 +43,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
acronyms[table]
id
acronym
- < 1143.307 rows + < 1143.341 rows > URL="../../tables/acronyms.html" target="_top" @@ -80,7 +80,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
id
email
... - < 2320 rows + < 2336 rows > URL="../../tables/journal.html" target="_top" @@ -130,7 +130,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
local_id
oa_original_id
... - < 2219.046 rows + < 2219.113 rows > URL="../../tables/oa_duplicates.html" target="_top" @@ -174,7 +174,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
ec_enterprise
bool[1]
ec_smevalidated
bool[1]
ec_nutscode
bool[1] - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -187,7 +187,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
id
otherid
type
- < 2361.455 rows + < 2344.848 rows > URL="../../tables/other_ids.html" target="_top" @@ -225,7 +225,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
urls[table]
id
url
- < 1216.098 rows + < 1216.223 rows > URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.svg index 0a5571cc..1c36c630 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/organizations.implied2degrees.svg @@ -30,7 +30,7 @@ < 1 -143.307 rows +143.341 rows   @@ -144,7 +144,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -251,7 +251,7 @@ < 2 -320 rows +336 rows   @@ -397,7 +397,7 @@ < 2 -219.046 rows +219.113 rows   @@ -441,7 +441,7 @@ < 2 -361.455 rows +344.848 rows   @@ -616,7 +616,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.dot index c5629c4d..779da781 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.dot @@ -40,7 +40,7 @@ digraph "oneDegreeRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -53,7 +53,7 @@ digraph "oneDegreeRelationshipsDiagram" {
id
text[2147483647]
otherid
text[2147483647]
type
text[2147483647] - < 2361.455 rows0 > + < 2344.848 rows0 > > URL="../../tables/other_ids.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.svg index ae891c1c..2e626bb5 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.1degree.svg @@ -39,7 +39,7 @@ < 2 -361.455 rows +344.848 rows 0 > @@ -74,7 +74,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.dot index 79f84b17..79766969 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.dot @@ -38,7 +38,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
acronyms[table]
...
< 1143.307 rows
< 1143.341 rows
> URL="../../tables/acronyms.html" target="_top" @@ -72,7 +72,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
journal[table]
...
< 1320 rows
< 1336 rows
> URL="../../tables/journal.html" target="_top" @@ -105,7 +105,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
oa_duplicates[table]
...
< 2219.046 rows
< 2219.113 rows
> URL="../../tables/oa_duplicates.html" target="_top" @@ -130,7 +130,7 @@ digraph "twoDegreesRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -143,7 +143,7 @@ digraph "twoDegreesRelationshipsDiagram" {
id
text[2147483647]
otherid
text[2147483647]
type
text[2147483647] - < 2361.455 rows0 > + < 2344.848 rows0 > > URL="../../tables/other_ids.html" target="_top" @@ -176,7 +176,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
urls[table]
...
< 1216.098 rows
< 1216.223 rows
> URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.svg index 5e9adb5a..d49450d5 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_ids.2degrees.svg @@ -26,7 +26,7 @@ < 1 -143.307 rows +143.341 rows   @@ -60,7 +60,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -150,7 +150,7 @@ < 1 -320 rows +336 rows   @@ -248,7 +248,7 @@ < 2 -219.046 rows +219.113 rows   @@ -298,7 +298,7 @@ < 2 -361.455 rows +344.848 rows 0 > @@ -429,7 +429,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.dot index 69c8f0d0..9b9b81d1 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.dot @@ -40,7 +40,7 @@ digraph "oneDegreeRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.svg index 09f0db74..374ec146 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.1degree.svg @@ -74,7 +74,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.dot index c74f9b3c..5015ccf5 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.dot @@ -38,7 +38,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
acronyms[table]
...
< 1143.307 rows
< 1143.341 rows
> URL="../../tables/acronyms.html" target="_top" @@ -60,7 +60,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
journal[table]
...
< 1320 rows
< 1336 rows
> URL="../../tables/journal.html" target="_top" @@ -105,7 +105,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
oa_duplicates[table]
...
< 2219.046 rows
< 2219.113 rows
> URL="../../tables/oa_duplicates.html" target="_top" @@ -130,7 +130,7 @@ digraph "twoDegreesRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -141,7 +141,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
other_ids[table]
...
< 2361.455 rows
< 2344.848 rows
> URL="../../tables/other_ids.html" target="_top" @@ -176,7 +176,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
urls[table]
...
< 1216.098 rows
< 1216.223 rows
> URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.svg index 4cacbec8..aca0ef3f 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/other_names.2degrees.svg @@ -26,7 +26,7 @@ < 1 -143.307 rows +143.341 rows   @@ -60,7 +60,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -150,7 +150,7 @@ < 1 -320 rows +336 rows   @@ -248,7 +248,7 @@ < 2 -219.046 rows +219.113 rows   @@ -285,7 +285,7 @@ < 2 -361.455 rows +344.848 rows   @@ -429,7 +429,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.dot index 7b1bbcf5..edc06968 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.dot @@ -28,7 +28,7 @@ digraph "oneDegreeRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.svg index d9e83e3f..83e2c5ec 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.1degree.svg @@ -74,7 +74,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.dot index e20e6373..2489bd96 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.dot @@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
acronyms[table]
...
< 1143.307 rows
< 1143.341 rows
> URL="../../tables/acronyms.html" target="_top" @@ -59,7 +59,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
journal[table]
...
< 1320 rows
< 1336 rows
> URL="../../tables/journal.html" target="_top" @@ -92,7 +92,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
oa_duplicates[table]
...
< 2219.046 rows
< 2219.113 rows
> URL="../../tables/oa_duplicates.html" target="_top" @@ -117,7 +117,7 @@ digraph "twoDegreesRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -128,7 +128,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
other_ids[table]
...
< 2361.455 rows
< 2344.848 rows
> URL="../../tables/other_ids.html" target="_top" @@ -163,7 +163,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
urls[table]
...
< 1216.098 rows
< 1216.223 rows
> URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.svg index 1317a2ef..d89a8ef3 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/relationships.2degrees.svg @@ -26,7 +26,7 @@ < 1 -143.307 rows +143.341 rows   @@ -60,7 +60,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -150,7 +150,7 @@ < 1 -320 rows +336 rows   @@ -248,7 +248,7 @@ < 2 -219.046 rows +219.113 rows   @@ -285,7 +285,7 @@ < 2 -361.455 rows +344.848 rows   @@ -396,7 +396,7 @@ < 1 -216.098 rows +216.223 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.dot index 37fb845e..0469ed47 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.dot @@ -27,7 +27,7 @@ digraph "oneDegreeRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -39,7 +39,7 @@ digraph "oneDegreeRelationshipsDiagram" {
urls[table]
id
text[2147483647]
url
text[2147483647] - < 1216.098 rows0 > + < 1216.223 rows0 > > URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.svg index 69f58059..d4d6a5f0 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.1degree.svg @@ -34,7 +34,7 @@ < 1 -216.098 rows +216.223 rows 0 > @@ -69,7 +69,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.dot index 5c07bc2c..92ad50db 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.dot @@ -37,7 +37,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
acronyms[table]
...
< 1143.307 rows
< 1143.341 rows
> URL="../../tables/acronyms.html" target="_top" @@ -59,7 +59,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
journal[table]
...
< 1320 rows
< 1336 rows
> URL="../../tables/journal.html" target="_top" @@ -92,7 +92,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
oa_duplicates[table]
...
< 2219.046 rows
< 2219.113 rows
> URL="../../tables/oa_duplicates.html" target="_top" @@ -117,7 +117,7 @@ digraph "twoDegreesRelationshipsDiagram" {
type
country
... - < 2497.617 rows12 > + < 2497.673 rows12 > > URL="../../tables/organizations.html" target="_top" @@ -128,7 +128,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
other_ids[table]
...
< 2361.455 rows
< 2344.848 rows
> URL="../../tables/other_ids.html" target="_top" @@ -162,7 +162,7 @@ digraph "twoDegreesRelationshipsDiagram" {
urls[table]
id
text[2147483647]
url
text[2147483647] - < 1216.098 rows0 > + < 1216.223 rows0 > > URL="../../tables/urls.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.svg index 98198d6d..8e14ddcc 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/urls.2degrees.svg @@ -26,7 +26,7 @@ < 1 -143.307 rows +143.341 rows   @@ -60,7 +60,7 @@ < 2 -497.617 rows +497.673 rows 12 > @@ -150,7 +150,7 @@ < 1 -320 rows +336 rows   @@ -248,7 +248,7 @@ < 2 -219.046 rows +219.113 rows   @@ -285,7 +285,7 @@ < 2 -361.455 rows +344.848 rows   @@ -390,7 +390,7 @@ < 1 -216.098 rows +216.223 rows 0 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.dot index b2fcb491..935e3437 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.dot @@ -39,7 +39,7 @@ digraph "twoDegreesRelationshipsDiagram" { - +
organizations[table]
...
< 2497.617 rows12 >
< 2497.673 rows12 >
> URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.svg index 4d368d77..2418ce40 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.2degrees.svg @@ -26,7 +26,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.dot index f90b09e0..27f6c906 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.dot @@ -43,7 +43,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" { - +
journal[table]
...
< 2320 rows
< 2336 rows
> URL="../../tables/journal.html" target="_top" @@ -54,7 +54,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" { - +
organizations[table]
...
< 2497.617 rows12 >
< 2497.673 rows12 >
> URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.svg index 4dc909f0..2cf5cdeb 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_countries.implied2degrees.svg @@ -26,7 +26,7 @@ < 2 -320 rows +336 rows   @@ -85,7 +85,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.dot index 7faa478b..6a8d4562 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.dot @@ -28,7 +28,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" { - +
journal[table]
...
< 2320 rows
< 2336 rows
> URL="../../tables/journal.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.svg index 94982c30..61ee770d 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/user_roles.implied2degrees.svg @@ -26,7 +26,7 @@ < 2 -320 rows +336 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.dot index 0255579c..59d73200 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.dot @@ -31,7 +31,7 @@ digraph "oneDegreeRelationshipsDiagramImplied" {
id
email
... - < 2320 rows + < 2336 rows > URL="../../tables/journal.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.svg index 3134af58..8f2eab64 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied1degrees.svg @@ -36,7 +36,7 @@ < 2 -320 rows +336 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.dot index 3b58740b..514e6a21 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.dot @@ -45,7 +45,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" {
id
email
... - < 2320 rows + < 2336 rows > URL="../../tables/journal.html" target="_top" @@ -56,7 +56,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" { - +
organizations[table]
...
< 2497.617 rows12 >
< 2497.673 rows12 >
> URL="../../tables/organizations.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.svg index f2928e53..1be56b59 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users.implied2degrees.svg @@ -36,7 +36,7 @@ < 2 -320 rows +336 rows   @@ -110,7 +110,7 @@ < 2 -497.617 rows +497.673 rows 12 > diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.dot b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.dot index 47bdc936..07186cfe 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.dot +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.dot @@ -28,7 +28,7 @@ digraph "twoDegreesRelationshipsDiagramImplied" { - +
journal[table]
...
< 2320 rows
< 2336 rows
> URL="../../tables/journal.html" target="_top" diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.svg b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.svg index a64de07e..196c4ce4 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.svg +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/diagrams/tables/users_view.implied2degrees.svg @@ -26,7 +26,7 @@ < 2 -320 rows +336 rows   diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/index.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/index.html index a03501d1..6cb2c2cc 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/index.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/index.html @@ -78,7 +78,7 @@

SchemaSpy Analysis of oa_organizations

-

Generated on mar apr 27 08:22 CEST 2021

+

Generated on mer mag 05 11:42 CEST 2021

@@ -118,7 +118,7 @@
COLUMNS - 185 + 189
@@ -204,7 +204,7 @@ 0 0 19 - 236350 + 236394 Table @@ -240,7 +240,7 @@ 0 1 2 - 216098 + 216223 Table @@ -249,7 +249,7 @@ 0 2 3 - 361455 + 344848 Table @@ -258,7 +258,7 @@ 0 2 6 - 320 + 336 Table @@ -267,7 +267,7 @@ 0 1 2 - 143307 + 143341 Table @@ -285,7 +285,7 @@ 0 0 2 - 497619 + 497675 Table @@ -294,7 +294,7 @@ 0 2 8 - 219046 + 219113 Table @@ -330,7 +330,7 @@ 12 2 22 - 497617 + 497673 Table @@ -428,7 +428,7 @@ organizations_simple_view 0 0 - 8 + 12 0 View diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/info-html.txt b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/info-html.txt index 53ffed89..151ad151 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/info-html.txt +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/info-html.txt @@ -1,5 +1,5 @@ -date=2021-04-27 08:22:28+0200 -os=Mac OS X 11.2.3 +date=2021-05-05 11:42:08+0200 +os=Mac OS X 11.3.1 schemaspy-version=6.1.0 schemaspy-build=6.1.0.41 2019-09-17 21:52:57 diagramImplementation=Viz.js 1.7.1 (Graphviz 2.40.1, Expat 2.1.0, Emscripten 1.37.9) diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/oa_organizations.public.xml b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/oa_organizations.public.xml index 4d0080ff..86f6117a 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/oa_organizations.public.xml +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/oa_organizations.public.xml @@ -5,7 +5,7 @@ - +
@@ -61,7 +61,7 @@
- +
@@ -131,7 +131,7 @@
- +
@@ -176,7 +176,7 @@
- +
@@ -197,7 +197,7 @@
- +
@@ -259,7 +259,7 @@
- +
@@ -268,6 +268,10 @@ + + + +
@@ -294,7 +298,7 @@
- +
@@ -364,7 +368,7 @@
- +
@@ -385,7 +389,7 @@
- +
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/acronyms.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/acronyms.html index f4542bed..d9c95336 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/acronyms.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/acronyms.html @@ -73,7 +73,7 @@
-

acronyms

143307 rows


+

acronyms

143341 rows


diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/journal.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/journal.html index 78aa7aa1..e35b8ff5 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/journal.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/journal.html @@ -73,7 +73,7 @@
-

journal

320 rows


+

journal

336 rows


diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/oa_duplicates.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/oa_duplicates.html index 1da354c6..8d1bfe21 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/oa_duplicates.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/oa_duplicates.html @@ -73,7 +73,7 @@
-

oa_duplicates

219046 rows


+

oa_duplicates

219113 rows


diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/org_index_search.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/org_index_search.html index ee83dd47..ceb22b5c 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/org_index_search.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/org_index_search.html @@ -73,7 +73,7 @@
-

org_index_search

497619 rows


+

org_index_search

497675 rows


diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations.html index 593cf95d..25a68e22 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations.html @@ -73,7 +73,7 @@
-

organizations

497617 rows


+

organizations

497673 rows


diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations_simple_view.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations_simple_view.html index ec8ced30..2b1cc72f 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations_simple_view.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/organizations_simple_view.html @@ -238,6 +238,74 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
n_similar_dupsint819null + +
+
+ +
+
n_suggested_dupsint819null + +
+
+ +
+
n_different_dupsint819null + +
+
+ +
+
candidate_dupbool1null + +
+
+ +
+
@@ -252,7 +320,7 @@
- +

@@ -265,6 +333,7 @@
  • acronyms
  • urls
  • organizations
  • +
  • oa_duplicates
  • diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/other_ids.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/other_ids.html index e287f728..06af3e20 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/other_ids.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/other_ids.html @@ -73,7 +73,7 @@
    -

    other_ids

    361455 rows


    +

    other_ids

    344848 rows


    diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/tmp_dedup_events.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/tmp_dedup_events.html index 6b278196..d8e4fcb3 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/tmp_dedup_events.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/tmp_dedup_events.html @@ -73,7 +73,7 @@
    -

    tmp_dedup_events

    236350 rows


    +

    tmp_dedup_events

    236394 rows


    diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/urls.html b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/urls.html index 1a790151..335b7e9d 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/urls.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/tables/urls.html @@ -73,7 +73,7 @@
    -

    urls

    216098 rows


    +

    urls

    216223 rows


    diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByCountry.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByCountry.html index 16c37184..12373cd9 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByCountry.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByCountry.html @@ -2,4 +2,5 @@ orgs="orgs" prev-function="prev()" next-function="next()" - show-status="1"> + show-status="1" + show-n-dups="1"> diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html index a6ae7870..cd80bf1e 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html @@ -2,4 +2,5 @@ orgs="orgs" prev-function="prev()" next-function="next()" - show-status="1"> + show-status="1" + show-n-dups="1"> diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/searchResults.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/searchResults.html index 28f644b5..9f62420f 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/searchResults.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/searchResults.html @@ -2,4 +2,5 @@ orgs="orgs" prev-function="prev()" next-function="next()" - show-status="1"> + show-status="1" + show-n-dups="1"> diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html index df344165..a491dcef 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html @@ -14,7 +14,7 @@ - + {{sr.oaName}}
    PID ({{oid.type}}): {{oid.id}} @@ -68,4 +68,4 @@
    - + diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html index e1006a3b..8e081fe6 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html @@ -40,8 +40,9 @@ Organization name - Place + Place Acronyms + # Dups
    diff/sugg/sim Type @@ -52,8 +53,9 @@ {{o.name}} {{o.status}} - {{o.city || '-'}}, {{o.country}} + {{o.city || '-'}}, {{o.country}} {{o.acronyms.join()}} + {{o.nDifferentDups ? o.nDifferentDups : '-'}} / {{o.nSuggestedDups ? o.nSuggestedDups : '-'}} / {{o.nSimilarDups ? o.nSimilarDups : '-'}} {{o.type}} diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js index 6d35ce79..aa1f04f2 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js @@ -213,7 +213,8 @@ orgsModule.directive('orgResultsPage', function($http, $location, $route) { 'onSelect' : '&', 'selectedOrg' : '=', 'mode' : '@', - 'showStatus' : '@' + 'showStatus' : '@', + 'showNDups' : '@' }, templateUrl: 'resources/html/parts/org_results_page.html', link: function(scope, element, attrs, ctrl) { @@ -270,14 +271,6 @@ orgsModule.directive('orgDuplicates', function($http, $location, $route) { 'createdBy' : currentUser(), 'relType' : 'is_similar' }); - - // I find and copy the duplicates of the selected org - call_http_get($http, 'api/organizations/duplicates?id=' + scope.newDuplicate.id, function(res) { - angular.forEach(res.data, function(dup) { - dup.localId = scope.orgId; - scope.duplicates.push(dup); - }); - }); } } }