diff --git a/.gitmodules b/.gitmodules index 6753b5e..e36a7d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "nim/htmlutils"] +[submodule "nim/lib/htmlutils"] path = nim/lib/htmlutils - url = ssh://git.woggioni.net:1122/mnt/git/htmlutils + url = git.woggioni.net:htmlutils diff --git a/build.sbt b/build.sbt index 5fe0fc0..575b4a8 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ -import org.oggio88.sbt.{NimPlugin, WildflyPlugin} -import org.oggio88.sbt.ConfigurationFile._ +import net.woggioni.sbt.{NimPlugin, WildflyPlugin} +import net.woggioni.sbt.ConfigurationFile._ name := "jpacrepo" @@ -32,7 +32,6 @@ libraryDependencies += "org.jboss.resteasy" % "resteasy-client" % Versions.restE libraryDependencies += "org.jboss.resteasy" % "resteasy-jackson2-provider" % Versions.restEasy % Test libraryDependencies += "org.scalatest" %% "scalatest" % Versions.scalatest % Test - enablePlugins(WarPlugin) enablePlugins(WildflyPlugin) enablePlugins(NimPlugin) @@ -71,4 +70,4 @@ resourceGenerators in Compile += Def.task({ (resourceManaged in Compile).value / "META-INF" / "persistence.xml", Map("dataSourceJNDI" -> datasourceJNDI.value, "dataBaseAction" -> databaseAction.value))) -}).taskValue \ No newline at end of file +}).taskValue diff --git a/nim/lib/htmlutils b/nim/lib/htmlutils index 219509c..5ee0456 160000 --- a/nim/lib/htmlutils +++ b/nim/lib/htmlutils @@ -1 +1 @@ -Subproject commit 219509c9102330ab0e989e19dc501043c3f8338c +Subproject commit 5ee04565faadd9c164e81ee2806cfa2e9b2540db diff --git a/nim/src/jpacrepo.nim b/nim/src/jpacrepo.nim index 62fe79a..ba43783 100644 --- a/nim/src/jpacrepo.nim +++ b/nim/src/jpacrepo.nim @@ -2,7 +2,6 @@ import dom import htmlutils/tree import htmlutils/utils import json -import streams import tables import strutils import sets @@ -25,7 +24,7 @@ type DownloadPanel = ref object proc newDownloadPanel(parent : Element) : DownloadPanel = let dp = DownloadPanel() - dp.pkgs = initSet[string]() + dp.pkgs = initHashSet[string]() htmlTreeAppend(parent): "div": classList = ["panel", "panel-default"] @@ -168,7 +167,7 @@ proc newPkgTable(parent: Element, searchString : string) : PkgTable = for key, value in pkgMap: for fragment in fragments: if fragment in key: - searchResult.add(key, value) + searchResult[key] = value for table in document.querySelectorAll("table.pkgtable"): table.parentNode.removeChild(table) htmlTreeAppend(parent): diff --git a/project/build.properties b/project/build.properties index 06703e3..08e4d79 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.9 +sbt.version=1.4.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index 5f91b7c..f4718ec 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.0.1") -addSbtPlugin("org.oggio88" % "xsbt-misc-plugin" % "0.1") +addSbtPlugin("net.woggioni" % "xsbt-misc-plugin" % "0.1")