diff --git a/NoahCrawler/.classpath b/.classpath similarity index 100% rename from NoahCrawler/.classpath rename to .classpath diff --git a/.gitignore b/.gitignore index 53f67ca..f58e900 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -# Add any directories, files, or patterns you don't want to be tracked by version control +/build/ +/target/ +/.settings diff --git a/NoahCrawler/.project b/.project similarity index 100% rename from NoahCrawler/.project rename to .project diff --git a/NoahCrawler/.gitignore b/NoahCrawler/.gitignore deleted file mode 100644 index 4457296..0000000 --- a/NoahCrawler/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/build/ -/target/ -/Sviluppo/ -/properties.txt diff --git a/NoahCrawler/.settings/.jsdtscope b/NoahCrawler/.settings/.jsdtscope deleted file mode 100644 index 5cee5ac..0000000 --- a/NoahCrawler/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/NoahCrawler/.settings/org.eclipse.jdt.core.prefs b/NoahCrawler/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 12af65f..0000000 --- a/NoahCrawler/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,106 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/NoahCrawler/.settings/org.eclipse.m2e.core.prefs b/NoahCrawler/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index 14b697b..0000000 --- a/NoahCrawler/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/NoahCrawler/.settings/org.eclipse.m2e.wtp.prefs b/NoahCrawler/.settings/org.eclipse.m2e.wtp.prefs deleted file mode 100644 index 0492759..0000000 --- a/NoahCrawler/.settings/org.eclipse.m2e.wtp.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.m2e.wtp.enabledProjectSpecificPrefs=false diff --git a/NoahCrawler/.settings/org.eclipse.wst.common.component b/NoahCrawler/.settings/org.eclipse.wst.common.component deleted file mode 100644 index e1045ff..0000000 --- a/NoahCrawler/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/NoahCrawler/.settings/org.eclipse.wst.common.project.facet.core.xml b/NoahCrawler/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 4c23d69..0000000 --- a/NoahCrawler/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/NoahCrawler/.settings/org.eclipse.wst.jsdt.ui.superType.container b/NoahCrawler/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/NoahCrawler/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/NoahCrawler/.settings/org.eclipse.wst.jsdt.ui.superType.name b/NoahCrawler/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/NoahCrawler/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/NoahCrawler/.settings/org.eclipse.wst.validation.prefs b/NoahCrawler/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 6f1cba6..0000000 --- a/NoahCrawler/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/NoahCrawler/.settings/org.eclipse.wst.ws.service.policy.prefs b/NoahCrawler/.settings/org.eclipse.wst.ws.service.policy.prefs deleted file mode 100644 index 6da2f3d..0000000 --- a/NoahCrawler/.settings/org.eclipse.wst.ws.service.policy.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.wst.ws.service.policy.projectEnabled=false diff --git a/NoahCrawler/src/it/noah/crawler/impl/ComuneNoahCrawler.java b/NoahCrawler/src/it/noah/crawler/impl/ComuneNoahCrawler.java deleted file mode 100644 index 2932262..0000000 --- a/NoahCrawler/src/it/noah/crawler/impl/ComuneNoahCrawler.java +++ /dev/null @@ -1,36 +0,0 @@ -package it.noah.crawler.impl; - -import it.noah.crawler.AbstractNoahCrawler; -import it.noah.crawler.NoahCrawler; -import it.noah.crawler.converter.impl.ComuneConverter; -import it.noah.crawler.dom.tag.Table; -import it.noah.crawler.enums.UrlEnum; -import it.noah.crawler.exception.NoahCrawlerException; -import it.noah.crawler.exception.ObjectNotFoundException; -import it.noah.crawler.model.Comune; - -import java.io.IOException; -import java.util.List; - -public class ComuneNoahCrawler extends AbstractNoahCrawler implements - NoahCrawler { - - public ComuneNoahCrawler() throws IOException { - super(UrlEnum.COMUNI_URL.getUrl()); - } - - @Override - public void run() throws NoahCrawlerException { - try { - List comuni = convertTable2Comuni(getTable("", true)); - // TODO una volta creata la lista va salvata sul db - } catch (ObjectNotFoundException e) { - e.printStackTrace(); - } - } - - private List convertTable2Comuni(Table table) { - return new ComuneConverter().convertTable(table); - } - -} diff --git a/README.md b/README.md deleted file mode 100644 index 39af52c..0000000 --- a/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# README # - -This README would normally document whatever steps are necessary to get your application up and running. - -### What is this repository for? ### - -* Quick summary -* Version -* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo) - -### How do I get set up? ### - -* Summary of set up -* Configuration -* Dependencies -* Database configuration -* How to run tests -* Deployment instructions - -### Contribution guidelines ### - -* Writing tests -* Code review -* Other guidelines - -### Who do I talk to? ### - -* Repo owner or admin -* Other community or team contact \ No newline at end of file diff --git a/NoahCrawler/WebContent/META-INF/MANIFEST.MF b/WebContent/META-INF/MANIFEST.MF similarity index 100% rename from NoahCrawler/WebContent/META-INF/MANIFEST.MF rename to WebContent/META-INF/MANIFEST.MF diff --git a/NoahCrawler/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml similarity index 100% rename from NoahCrawler/WebContent/WEB-INF/web.xml rename to WebContent/WEB-INF/web.xml diff --git a/NoahCrawler/pom.xml b/pom.xml similarity index 89% rename from NoahCrawler/pom.xml rename to pom.xml index 71583a6..bc274a2 100644 --- a/NoahCrawler/pom.xml +++ b/pom.xml @@ -45,5 +45,10 @@ mysql-connector-java 5.1.40 + + org.geonames + geonames + 1.0 + \ No newline at end of file diff --git a/NoahCrawler/src/it/noah/crawler/AbstractNoahCrawler.java b/src/it/noah/crawler/AbstractNoahCrawler.java similarity index 76% rename from NoahCrawler/src/it/noah/crawler/AbstractNoahCrawler.java rename to src/it/noah/crawler/AbstractNoahCrawler.java index 13126bc..9b8ca42 100644 --- a/NoahCrawler/src/it/noah/crawler/AbstractNoahCrawler.java +++ b/src/it/noah/crawler/AbstractNoahCrawler.java @@ -1,21 +1,27 @@ package it.noah.crawler; +import java.io.IOException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import it.noah.crawler.dom.NoahDOMExplorer; import it.noah.crawler.dom.tag.Table; import it.noah.crawler.exception.NoahCrawlerException; import it.noah.crawler.exception.ObjectNotFoundException; -import java.io.IOException; - public abstract class AbstractNoahCrawler implements NoahCrawler { + private final static Logger log = LoggerFactory + .getLogger(AbstractNoahCrawler.class); + private NoahDOMExplorer explorer; public AbstractNoahCrawler(String url) { try { this.explorer = new NoahDOMExplorer(url); } catch (IOException e) { - e.printStackTrace(); + log.error(e.getMessage()); } } diff --git a/NoahCrawler/src/it/noah/crawler/NoahCrawler.java b/src/it/noah/crawler/NoahCrawler.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/NoahCrawler.java rename to src/it/noah/crawler/NoahCrawler.java diff --git a/NoahCrawler/src/it/noah/crawler/converter/Converter.java b/src/it/noah/crawler/converter/Converter.java similarity index 69% rename from NoahCrawler/src/it/noah/crawler/converter/Converter.java rename to src/it/noah/crawler/converter/Converter.java index d9301d4..97112ff 100644 --- a/NoahCrawler/src/it/noah/crawler/converter/Converter.java +++ b/src/it/noah/crawler/converter/Converter.java @@ -1,11 +1,11 @@ package it.noah.crawler.converter; -import it.noah.crawler.dom.tag.Table; - import java.util.List; +import it.noah.crawler.dom.tag.Table; + public interface Converter { - public List convertTable(Table table); + public List convertTable(Table table); } diff --git a/NoahCrawler/src/it/noah/crawler/converter/impl/ComuneConverter.java b/src/it/noah/crawler/converter/impl/ComuneConverter.java similarity index 62% rename from NoahCrawler/src/it/noah/crawler/converter/impl/ComuneConverter.java rename to src/it/noah/crawler/converter/impl/ComuneConverter.java index 9f06c39..a568dd7 100644 --- a/NoahCrawler/src/it/noah/crawler/converter/impl/ComuneConverter.java +++ b/src/it/noah/crawler/converter/impl/ComuneConverter.java @@ -1,18 +1,23 @@ package it.noah.crawler.converter.impl; +import java.util.List; + +import org.geonames.PostalCode; + import it.noah.crawler.converter.Converter; import it.noah.crawler.dom.tag.Table; import it.noah.crawler.model.Comune; -import java.util.ArrayList; -import java.util.List; - public class ComuneConverter implements Converter { @Override public List convertTable(Table table) { - List comuni = new ArrayList(); - return comuni; + return null; + } + + public List convertPostalCode(List postalCodes) { + // TODO da implementare + return null; } } diff --git a/NoahCrawler/src/it/noah/crawler/converter/impl/ProvinciaConverter.java b/src/it/noah/crawler/converter/impl/ProvinciaConverter.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/converter/impl/ProvinciaConverter.java rename to src/it/noah/crawler/converter/impl/ProvinciaConverter.java diff --git a/NoahCrawler/src/it/noah/crawler/dom/NoahDOMExplorer.java b/src/it/noah/crawler/dom/NoahDOMExplorer.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/dom/NoahDOMExplorer.java rename to src/it/noah/crawler/dom/NoahDOMExplorer.java diff --git a/NoahCrawler/src/it/noah/crawler/dom/tag/Cell.java b/src/it/noah/crawler/dom/tag/Cell.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/dom/tag/Cell.java rename to src/it/noah/crawler/dom/tag/Cell.java diff --git a/NoahCrawler/src/it/noah/crawler/dom/tag/Table.java b/src/it/noah/crawler/dom/tag/Table.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/dom/tag/Table.java rename to src/it/noah/crawler/dom/tag/Table.java diff --git a/NoahCrawler/src/it/noah/crawler/dom/tag/TableHeader.java b/src/it/noah/crawler/dom/tag/TableHeader.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/dom/tag/TableHeader.java rename to src/it/noah/crawler/dom/tag/TableHeader.java diff --git a/NoahCrawler/src/it/noah/crawler/dom/tag/TableRow.java b/src/it/noah/crawler/dom/tag/TableRow.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/dom/tag/TableRow.java rename to src/it/noah/crawler/dom/tag/TableRow.java diff --git a/NoahCrawler/src/it/noah/crawler/dom/tag/builder/TableBuilder.java b/src/it/noah/crawler/dom/tag/builder/TableBuilder.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/dom/tag/builder/TableBuilder.java rename to src/it/noah/crawler/dom/tag/builder/TableBuilder.java diff --git a/NoahCrawler/src/it/noah/crawler/dom/tag/builder/TableHeaderBuilder.java b/src/it/noah/crawler/dom/tag/builder/TableHeaderBuilder.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/dom/tag/builder/TableHeaderBuilder.java rename to src/it/noah/crawler/dom/tag/builder/TableHeaderBuilder.java diff --git a/NoahCrawler/src/it/noah/crawler/dom/tag/builder/TableRowBuilder.java b/src/it/noah/crawler/dom/tag/builder/TableRowBuilder.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/dom/tag/builder/TableRowBuilder.java rename to src/it/noah/crawler/dom/tag/builder/TableRowBuilder.java diff --git a/NoahCrawler/src/it/noah/crawler/enums/CrawlerEnum.java b/src/it/noah/crawler/enums/CrawlerEnum.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/enums/CrawlerEnum.java rename to src/it/noah/crawler/enums/CrawlerEnum.java diff --git a/NoahCrawler/src/it/noah/crawler/enums/UrlEnum.java b/src/it/noah/crawler/enums/UrlEnum.java similarity index 67% rename from NoahCrawler/src/it/noah/crawler/enums/UrlEnum.java rename to src/it/noah/crawler/enums/UrlEnum.java index ef4bf8a..056b544 100644 --- a/NoahCrawler/src/it/noah/crawler/enums/UrlEnum.java +++ b/src/it/noah/crawler/enums/UrlEnum.java @@ -2,8 +2,7 @@ package it.noah.crawler.enums; public enum UrlEnum { PROVINCE_URL( - "http://www.aci.it/i-servizi/normative/codice-della-strada/elenco-sigle-province-ditalia.html"), - COMUNI_URL("https://it.wikipedia.org/wiki/Citt%C3%A0_d'Italia"); + "http://www.aci.it/i-servizi/normative/codice-della-strada/elenco-sigle-province-ditalia.html"); private String url; diff --git a/NoahCrawler/src/it/noah/crawler/exception/NoahCrawlerException.java b/src/it/noah/crawler/exception/NoahCrawlerException.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/exception/NoahCrawlerException.java rename to src/it/noah/crawler/exception/NoahCrawlerException.java diff --git a/NoahCrawler/src/it/noah/crawler/exception/ObjectNotFoundException.java b/src/it/noah/crawler/exception/ObjectNotFoundException.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/exception/ObjectNotFoundException.java rename to src/it/noah/crawler/exception/ObjectNotFoundException.java diff --git a/NoahCrawler/src/it/noah/crawler/factory/NoahCrawlerFactory.java b/src/it/noah/crawler/factory/NoahCrawlerFactory.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/factory/NoahCrawlerFactory.java rename to src/it/noah/crawler/factory/NoahCrawlerFactory.java diff --git a/src/it/noah/crawler/impl/ComuneNoahCrawler.java b/src/it/noah/crawler/impl/ComuneNoahCrawler.java new file mode 100644 index 0000000..56dfc32 --- /dev/null +++ b/src/it/noah/crawler/impl/ComuneNoahCrawler.java @@ -0,0 +1,40 @@ +package it.noah.crawler.impl; + +import org.geonames.Toponym; +import org.geonames.ToponymSearchCriteria; +import org.geonames.ToponymSearchResult; +import org.geonames.WebService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import it.noah.crawler.NoahCrawler; +import it.noah.crawler.exception.NoahCrawlerException; + +public class ComuneNoahCrawler implements NoahCrawler { + + private static final Logger log = LoggerFactory + .getLogger(ComuneNoahCrawler.class); + + // http://api.geonames.org/postalCodeSearch?placename=IT&username=morgoth + + @Override + public void run() throws NoahCrawlerException { + try { + WebService.setUserName("morgoth"); + ToponymSearchCriteria criteria = new ToponymSearchCriteria(); + criteria.setLanguage("IT"); + criteria.setCountryCode("IT"); + criteria.setMaxRows(1000); + ToponymSearchResult result = WebService.search(criteria); + System.out.println(result.getTotalResultsCount()); + for (Toponym toponym : result.getToponyms()) { + // TODO FINIRE IMPLEMENTAZIONE + } + // TODO salvare sul database + } catch (Exception e) { + log.error(e.getMessage()); + } + + } + +} diff --git a/NoahCrawler/src/it/noah/crawler/impl/ProvinciaNoahCrawler.java b/src/it/noah/crawler/impl/ProvinciaNoahCrawler.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/impl/ProvinciaNoahCrawler.java rename to src/it/noah/crawler/impl/ProvinciaNoahCrawler.java diff --git a/NoahCrawler/src/it/noah/crawler/io/DirFilter.java b/src/it/noah/crawler/io/DirFilter.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/io/DirFilter.java rename to src/it/noah/crawler/io/DirFilter.java diff --git a/NoahCrawler/src/it/noah/crawler/io/FileUtils.java b/src/it/noah/crawler/io/FileUtils.java similarity index 94% rename from NoahCrawler/src/it/noah/crawler/io/FileUtils.java rename to src/it/noah/crawler/io/FileUtils.java index 7883655..fdab1f4 100644 --- a/NoahCrawler/src/it/noah/crawler/io/FileUtils.java +++ b/src/it/noah/crawler/io/FileUtils.java @@ -67,7 +67,7 @@ public class FileUtils { int spaces = 0; try { - for (int i = 0; (ch = in.read()) != -1; i++) { + while ((ch = in.read()) != -1) { if (Character.isWhitespace((char) ch)) { spaces++; } diff --git a/NoahCrawler/src/it/noah/crawler/model/Comune.java b/src/it/noah/crawler/model/Comune.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/model/Comune.java rename to src/it/noah/crawler/model/Comune.java diff --git a/NoahCrawler/src/it/noah/crawler/model/Provincia.java b/src/it/noah/crawler/model/Provincia.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/model/Provincia.java rename to src/it/noah/crawler/model/Provincia.java diff --git a/NoahCrawler/src/it/noah/crawler/persistence/AccessProvincia.java b/src/it/noah/crawler/persistence/AccessProvincia.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/persistence/AccessProvincia.java rename to src/it/noah/crawler/persistence/AccessProvincia.java diff --git a/NoahCrawler/src/it/noah/crawler/persistence/ConnectionFactory.java b/src/it/noah/crawler/persistence/ConnectionFactory.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/persistence/ConnectionFactory.java rename to src/it/noah/crawler/persistence/ConnectionFactory.java diff --git a/NoahCrawler/src/it/noah/crawler/servlet/NoahCrawlerServlet.java b/src/it/noah/crawler/servlet/NoahCrawlerServlet.java similarity index 100% rename from NoahCrawler/src/it/noah/crawler/servlet/NoahCrawlerServlet.java rename to src/it/noah/crawler/servlet/NoahCrawlerServlet.java