Fix #34 (#35)

* Updated Front END

* Datalet Synch Icon

* FrontEnd updates

* Adding internazionalization (EN - IT)

* Internazionalization Updates

* Fix Municipality Translation

* Responsivness

* Toggle button fix

* Added About section

* Internationalization Administration Functionalities

* Changes Next Release updated

* WordCloud Fix; SVG logo; disable pass update if Fiware

* Modified Screenshots

* Modified changes next release

* Update Changelog
Merge pull request #1 from OPSILab/master

Updating Fork
Addedd Related Resource to DCATDataset model
Persistence Manager Fix
Updated Front END
Datalet Synch Icon
Updates for Incubated Status

* Reformatted Markdown
* Restructured README according to standard-readme
* Added additional badges to readme and docs front-page
* Added code highlights
* Added FIWARE CSS and favicon

Merge pull request #9 from jason-fox/feature/css-badges-readme

Updates for Incubated Status
FrontEnd updates
Merge remote-tracking branch 'origin/frontend-update'
Merge branch 'master' of https://github.com/robcalla/Idra.git
Adding internazionalization (EN - IT)
Internazionalization Updates
Fix Municipality Translation
Responsivness
Toggle button fix
Added About section
Fixed docker-compose

Dump path for idra_db.sql fixed and wait-for-it script for DB container
added
Internationalization Administration Functionalities
Changes Next Release updated
WordCloud Fix; SVG logo; disable pass update if Fiware
Merge branch 'master' of https://github.com/OPSILab/Idra.git
Transferring API Description file from Apiary.io
Modified Screenshots
Merge branch 'master' of https://github.com/OPSILab/Idra.git
Modified changes next release

* Statistics First Commit

* Statistics Section Updated

* TagCloud update

* Statistics Updated

* Statistics Server Updated

* Statistics updated solr schema

* File Preview First commit

* Update Client Configurations for Preview

* Front End Updates

* Preview fix

* Fix

* Add license scan report and status

Signed-off-by: fossabot <badges@fossa.io>

* Added Support to KML file - resolving #14

* Fix

* Fix geojson preview

* Added Timeout on Preview

* Updated Pom

* Rights Holder minor fix

* Minor Fix

* Updated changes next release

* DCATDumpConnector fix

* Updated Changes Next Release

* Changed Version Property to v1.3.0

* Updated Changes next release

* Junar & OpenDataSoft Fix

* Updated CHANGES_NEXT_RELEASE

* Removed default api-key value

* Fix Idm login issue

* Fix #34 and update

CHANGELOG.txt

@@ -1,3 +1,10 @@
+v1.3.0
+- New Feature: Added Distribution Preview for CSV, JSON, PDF, XML, GEOJSON and KML files
+- New Feature: Added Statistics section about catalogues, distribution formats and licenses
+- Fix: Minor fix for DCATDumpConnector
+- New Feature: Support for OpenDataSoft Catalogues
+- New Feature: Support for Junar Catalogues
+
 v1.2.0:
 - New Feature: Support for StatPortal OpenData (SPOD) portals
 - New Feature: Idra portal - Multilanguage support (EN,IT)

CHANGES_NEXT_RELEASE.txt

@@ -1,6 +1,2 @@
-v1.3.0
-- New Feature: Added Distribution Preview for CSV, JSON, PDF, XML, GEOJSON and KML files
-- New Feature: Added Statistics section about catalogues, distribution formats and licenses
-- Fix: Minor fix for DCATDumpConnector
-- New Feature: Support for OpenDataSoft Catalogues
-- New Feature: Support for Junar Catalogues
+v1.3.1
+- Fix: Idm Login #34

Idra/pom.xml

@@ -422,11 +422,11 @@
 
 		<!-- https://mvnrepository.com/artifact/org.apache.tika/tika-core -->
 <!-- https://mvnrepository.com/artifact/org.apache.tika/tika-parsers -->
-<dependency>
-    <groupId>org.apache.tika</groupId>
-    <artifactId>tika-parsers</artifactId>
-    <version>1.20</version>
-</dependency>
+<!-- <dependency> -->
+<!--     <groupId>org.apache.tika</groupId> -->
+<!--     <artifactId>tika-parsers</artifactId> -->
+<!--     <version>1.20</version> -->
+<!-- </dependency> -->
 
 
 		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12 -->

Idra/src/main/java/it/eng/idra/api/ClientAPI.java

@@ -58,6 +58,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
@@ -67,7 +68,6 @@
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
@@ -101,8 +101,6 @@
 
 import org.apache.logging.log4j.*;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.tika.parser.txt.CharsetDetector;
-import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
 
 @Path("/client")
@@ -559,8 +557,12 @@ public Response downloadFromUri(@Context HttpServletRequest httpRequest, @QueryP
 
 		logger.info("Download file API: "+downloadFile);
 		String compiledUri = url;
-		client = ClientBuilder.newBuilder().connectTimeout(5, TimeUnit.SECONDS).readTimeout(5, TimeUnit.SECONDS).build();
-//		client = ClientBuilder.newClient();
+		//client = ClientBuilder.newBuilder().readTimeout(10, TimeUnit.SECONDS).build();
+
+		client = ClientBuilder.newClient();
+		client.property(ClientProperties.CONNECT_TIMEOUT, 5000);
+	    client.property(ClientProperties.READ_TIMEOUT,    5000);
+
 		try {
 			WebTarget webTarget = client.target(compiledUri);
 			Response request = webTarget.request().get();
@@ -571,9 +573,9 @@ public Response downloadFromUri(@Context HttpServletRequest httpRequest, @QueryP
 
 				if(StringUtils.isNotBlank(format) && format.toLowerCase().contains("csv")) {
 					InputStream stream = new BufferedInputStream((InputStream) request.getEntity());
-					CharsetDetector charDetector = new CharsetDetector();
-					charDetector.setText(stream);
-					responseBuilder.entity(new InputStreamReader(stream,charDetector.detect().getName()));
+//					CharsetDetector charDetector = new CharsetDetector();
+//					charDetector.setText(stream);
+					responseBuilder.entity(new InputStreamReader(stream,StandardCharsets.ISO_8859_1));
 				}else {
 					responseBuilder.entity(new StreamingOutput() {
 						@Override

Idra/src/main/resources/configuration.properties

@@ -16,8 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #-------------------------------------------------------------------------------
 ################# PLATFORM API ###################################
-idra.version=1.3.0
-idra.release.timestamp=2019-02-27T13:00:00Z
+idra.version=1.3.1
+idra.release.timestamp=2019-03-06T17:00:00Z
 
 ################# PERSISTENCE MANAGER CONFIGURATION ##############
 #&rewriteBatchedStatements\=true

IdraPortal/src/main/webapp/catalogues/single_catalogue.js

@@ -284,7 +284,7 @@ angular.module("IdraPlatform").controller('CatalogueCtrl',['$scope','$http','con
 				homepageInvalid:false,
 				refreshPeriod:"",
 				description:"",
-				APIKey: 'prova-api-key',
+				APIKey: '',
 				location:"",
 				locationDescription:"",
 				dcatProfile:'',
@@ -363,7 +363,7 @@ angular.module("IdraPlatform").controller('CatalogueCtrl',['$scope','$http','con
 					location:"",
 					dcatProfile:'',
 					locationDescription:"",
-					APIKey: 'prova-api-key',
+					APIKey: '',
 					image: {
 						imageData: "data:image/png;base64,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"
 					},

IdraPortal/src/main/webapp/css/bootstrap-restyle.css

@@ -156,7 +156,7 @@ a {
 /* CONTENT */
 
 #content {
-  padding-top: 8em;
+  padding-top: 6em;
   /*padding-top: 5.5em;*/
 }