D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

duplicate -> raw

This commit is contained in:
Michele Artini 2021-04-27 08:23:45 +02:00
parent ff49b22198
commit 491b86ddd0
11 changed files with 1750 additions and 1882 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/utils/OrganizationStatus.java
View File

@ -4,5 +4,5 @@ public enum OrganizationStatus {
suggested, // from user or dedup depends by created_by field
approved, // normal status of valid organizations
hidden, // hidden organizations after the fix of a conflict
duplicate // organizations that duplicate of a valid organization (their id is not an openorgs id)
raw // raw organizations (their id is not an openorgs id)
}

4
apps/dnet-orgs-database-application/src/main/resources/sql/importDedupEvents.sql
View File

@ -49,9 +49,9 @@ FROM (
) as c
ON CONFLICT DO NOTHING;
-- NEW ORGANIZATIONS (duplicate)
-- NEW ORGANIZATIONS (raw)
INSERT INTO organizations(id, name, country, status, ec_legalbody, ec_legalperson, ec_nonprofit, ec_researchorganization, ec_highereducation, ec_internationalorganizationeurinterests, ec_internationalorganization, ec_enterprise, ec_smevalidated, ec_nutscode, created_by, modified_by)
SELECT oa_original_id, oa_name, oa_country, 'duplicate', ec_legalbody, ec_legalperson, ec_nonprofit, ec_researchorganization, ec_highereducation, ec_internationalorganizationeurinterests, ec_internationalorganization, ec_enterprise, ec_smevalidated, ec_nutscode, 'dedupWf', 'dedupWf'
SELECT oa_original_id, oa_name, oa_country, 'raw', ec_legalbody, ec_legalperson, ec_nonprofit, ec_researchorganization, ec_highereducation, ec_internationalorganizationeurinterests, ec_internationalorganization, ec_enterprise, ec_smevalidated, ec_nutscode, 'dedupWf', 'dedupWf'
FROM tmp_dedup_events
WHERE oa_original_id NOT LIKE 'openorgs\_\_\_\_::%'
ON CONFLICT DO NOTHING;

4
apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/anomalies.html
View File

@ -130,10 +130,6 @@
<td><a href='tables/tmp_dedup_events.html'>tmp_dedup_events</a></td>
<td>236350</td>
</tr>
<tr>
<td><a href='tables/tmp_dedup_events_bak.html'>tmp_dedup_events_bak</a></td>
<td>223437</td>
</tr>
</tbody>
</table>
</div>

3582
apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/columns.html
View File

File diff suppressed because it is too large Load Diff

1
apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/deletionOrder.txt
View File

@ -1,4 +1,3 @@
tmp_dedup_events_bak
tmp_dedup_events
org_index_search
user_countries

17
apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/index.html
View File

@ -78,7 +78,7 @@
<div class="col-md-12">
<div class="callout callout-info">
<h4>SchemaSpy Analysis of oa_organizations</h4>
<p>Generated on lun apr 26 11:10 CEST 2021</p>
<p>Generated on mar apr 27 08:22 CEST 2021</p>
</div>
</div>
</div>
@ -94,7 +94,7 @@
<span class="info-box-icon bg-aqua"><i class="fa fa-table"></i></span>
<div class="info-box-content">
<span class="info-box-text">TABLES</span>
<span class="info-box-number">20</span>
<span class="info-box-number">19</span>
</div>
<!-- /.info-box-content -->
</div>
@ -118,7 +118,7 @@
<span class="info-box-icon bg-green"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span></span>
<div class="info-box-content">
<span class="info-box-text">COLUMNS</span>
<span class="info-box-number">193</span>
<span class="info-box-number">185</span>
</div>
<!-- /.info-box-content -->
</div>
@ -142,7 +142,7 @@
<span class="info-box-icon bg-red-active"><i class="fa fa-question" aria-hidden="true"></i></span>
<div class="info-box-content">
<span class="info-box-text">Anomalies</span>
<span class="info-box-number">6</span>
<span class="info-box-number">5</span>
</div>
<!-- /.info-box-content -->
</div>
@ -316,15 +316,6 @@
<td class="detail" align="right">Table</td>
<td class="comment detail" style="display: table-cell;"></td>
</tr>
<tr class="tbl even" valign="top">
<td class="detail"><a href="tables/tmp_dedup_events_bak.html">tmp_dedup_events_bak</a></td>
<td class="detail" align="right">0</td>
<td class="detail" align="right">0</td>
<td class="detail" align="right">8</td>
<td class="detail" align="right">223437</td>
<td class="detail" align="right">Table</td>
<td class="comment detail" style="display: table-cell;"></td>
</tr>
<tr class="tbl even" valign="top">
<td class="detail"><a href="tables/relationships.html">relationships</a></td>
<td class="detail" align="right">0</td>

2
apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/info-html.txt
View File

@ -1,4 +1,4 @@
date=2021-04-26 11:10:28+0200
date=2021-04-27 08:22:28+0200
os=Mac OS X 11.2.3
schemaspy-version=6.1.0
schemaspy-build=6.1.0.41 2019-09-17 21:52:57

1
apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/insertionOrder.txt
View File

@ -17,4 +17,3 @@ relationships
user_countries
org_index_search
tmp_dedup_events
tmp_dedup_events_bak

10
apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/oa_organizations.public.xml
View File

@ -385,16 +385,6 @@
<column autoUpdated="false" defaultValue="null" digits="0" id="17" name="oa_url" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
<column autoUpdated="false" defaultValue="null" digits="0" id="18" name="pid_list" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
</table>
<table name="tmp_dedup_events_bak" numRows="223437" remarks="" schema="public" type="TABLE">
<column autoUpdated="false" defaultValue="null" digits="0" id="0" name="group_id" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
<column autoUpdated="false" defaultValue="null" digits="0" id="1" name="local_id" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
<column autoUpdated="false" defaultValue="null" digits="0" id="2" name="oa_acronym" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
<column autoUpdated="false" defaultValue="null" digits="0" id="3" name="oa_collectedfrom" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
<column autoUpdated="false" defaultValue="null" digits="0" id="4" name="oa_country" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
<column autoUpdated="false" defaultValue="null" digits="0" id="5" name="oa_name" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
<column autoUpdated="false" defaultValue="null" digits="0" id="6" name="oa_original_id" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
<column autoUpdated="false" defaultValue="null" digits="0" id="7" name="oa_url" nullable="true" remarks="" size="2147483647" type="text" typeCode="12"/>
</table>
<table name="urls" numRows="216098" remarks="" schema="public" type="TABLE">
<column autoUpdated="false" defaultValue="null" digits="0" id="0" name="id" nullable="false" remarks="" size="2147483647" type="text" typeCode="12">
<parent column="id" foreignKey="urls_id_fkey" implied="false" onDeleteCascade="true" schema="public" table="organizations"/>

3
apps/dnet-orgs-database-application/src/main/resources/static/dbmodel/orphans.html
View File

@ -87,9 +87,6 @@
<div class="item">
<object type="image/svg+xml" id="org_index_searchDegreeImg" data="diagrams/orphans/org_index_search.1degree.svg" style="max-width:100%;" border="0" align="top"></object>
</div>
<div class="item">
<object type="image/svg+xml" id="tmp_dedup_events_bakDegreeImg" data="diagrams/orphans/tmp_dedup_events_bak.1degree.svg" style="max-width:100%;" border="0" align="top"></object>
</div>
<div class="item">
<object type="image/svg+xml" id="tmp_dedup_eventsDegreeImg" data="diagrams/orphans/tmp_dedup_events.1degree.svg" style="max-width:100%;" border="0" align="top"></object>
</div>

6
apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/browse.html
View File

@ -15,7 +15,7 @@
<th class="text-right text-nowrap col-4" ng-if="mode == 0" title="valid organizations">#</th>
<th class="text-right text-nowrap col-1" ng-if="mode == 1" title="valid organizations"># approved</th>
<th class="text-right text-nowrap col-1" ng-if="mode == 1" title="to be approved by an administrator"># suggested</th>
<th class="text-right text-nowrap col-1" ng-if="mode == 1" title="duplicates(not openorgs) of a valid organization"># duplicate</th>
<th class="text-right text-nowrap col-1" ng-if="mode == 1" title="raw organizations (not openorgs)"># raw</th>
<th class="text-right text-nowrap col-1" ng-if="mode == 1" title="organizations hidden by the system (for example fixing a conflict)"># hidden</th>
</tr>
</thead>
@ -31,8 +31,8 @@
<span ng-if="!e.values.suggested || e.values.suggested == 0">-</span>
</td>
<td class="text-right" ng-if="mode == 1">
<a href="#!{{resultsBasePath}}/0/50/duplicate/{{e.code}}" ng-if="e.values.duplicate && e.values.duplicate > 0">{{e.values.duplicate}}</a>
<span ng-if="!e.values.duplicate || e.values.duplicate == 0">-</span>
<a href="#!{{resultsBasePath}}/0/50/raw/{{e.code}}" ng-if="e.values.raw && e.values.raw > 0">{{e.values.raw}}</a>
<span ng-if="!e.values.raw || e.values.raw == 0">-</span>
</td>
<td class="text-right" ng-if="mode == 1">
<a href="#!{{resultsBasePath}}/0/50/hidden/{{e.code}}" ng-if="e.values.hidden && e.values.hidden > 0">{{e.values.hidden}}</a>