Updates for missing systems

evecentral · Aug 26, 2015 · 9c77d74 · 9c77d74
1 parent 2f70156
commit 9c77d74
Show file tree

Hide file tree

Showing 6 changed files with 38,635 additions and 38,192 deletions.
diff --git a/core/build.sbt b/core/build.sbt
@@ -20,7 +20,7 @@ name := "eve-central-ng"
 
 organization  := "com.evecentral"
 
-version := "3.1.7"
+version := "3.2.0"
 
 scalaVersion := "2.10.5"
 

diff --git a/core/launch.sh b/core/launch.sh
@@ -5,4 +5,4 @@ ulimit -n 1000000
 
 GC_OPTS="-XX:+UseParNewGC -verbose:gc -XX:GCLogFileSize=10M  -Xloggc:logs/gc.log -XX:-UseGCLogFileRotation -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution -XX:+UseConcMarkSweepGC "
 
-su evec -c "$JAVA  -XX:+UseAdaptiveSizePolicy -Xmx23g $GC_OPTS -jar target/scala-2.10/eve-central-ng-assembly-3.1.7.jar" > /dev/null &
+su evec -c "$JAVA  -XX:+UseAdaptiveSizePolicy -Xmx23g $GC_OPTS -jar target/scala-2.10/eve-central-ng-assembly-3.2.0.jar" > /dev/null &
diff --git a/core/src/main/scala/com/evecentral/OrderStatistics.scala b/core/src/main/scala/com/evecentral/OrderStatistics.scala
@@ -47,6 +47,7 @@ private class LazyOrderStatistics(over: Seq[MarketOrder], val highToLow: Boolean
 object OrderStatistics {
 
   import com.evecentral.dataaccess.MarketOrder._
+  private val log = LoggerFactory.getLogger(getClass)
 
   def apply(over: Seq[MarketOrder], highToLow: Boolean = false): OrderStatistics = {
     val overFiltered = over.filter(_.price > 0.15) // Limit prices to avoid 0.01 ISKers
@@ -64,8 +65,11 @@ object OrderStatistics {
   }
 
   def cached(query: GetOrdersFor, data: OrderStatistics): CachedOrderStatistics = {
-    CachedOrderStatistics(query, data.volume, data.wavg, data.avg, data.variance, data.stdDev, data.median,
+    log.info("Producing cached stats for " + query)
+    val cached = CachedOrderStatistics(query, data.volume, data.wavg, data.avg, data.variance, data.stdDev, data.median,
       data.fivePercent, data.max, data.min, data.highToLow, data.generated)
+    log.info("Cached stats done")
+    cached
   }
 
   def max(over: Seq[MarketOrder]): Double = {

diff --git a/core/src/main/scala/com/evecentral/dataaccess/GetOrders.scala b/core/src/main/scala/com/evecentral/dataaccess/GetOrders.scala
@@ -5,6 +5,7 @@ import akka.dispatch.{RequiresMessageQueue, BoundedMessageQueueSemantics}
 import com.evecentral.Database
 import net.noerd.prequel.{LongFormattable, StringFormattable}
 import org.joda.time.{DateTime, Period}
+import org.slf4j.LoggerFactory
 
 case class MarketOrder(typeid: Long, orderId: Long, price: Double, bid: Boolean, station: Station, system: SolarSystem, region: Region, range: Int,
                        volremain: Long, volenter: Long, minVolume: Long, expires: Period, reportedAt: DateTime) {
@@ -27,6 +28,8 @@ case class OrderList(query: GetOrdersFor, result: Seq[MarketOrder])
 
 class GetOrdersActor extends Actor with RequiresMessageQueue[BoundedMessageQueueSemantics] {
 
+  private val log = LoggerFactory.getLogger(getClass)
+
   /**
    * This query does a lot of internal SQL building and not a prepared statement. I'm sorry,
    * but at least everything is typesafe :-)
@@ -46,7 +49,7 @@ class GetOrdersActor extends Actor with RequiresMessageQueue[BoundedMessageQueue
       case None => "1=1"
     }
 
-    db.transaction {
+    val orders = db.transaction {
       tx =>
 
         tx.select("SELECT typeid,orderid,price,bid,stationid,systemid,regionid,range,volremain,volenter,minvolume,EXTRACT(EPOCH FROM duration),reportedtime" +
@@ -61,10 +64,11 @@ class GetOrdersActor extends Actor with RequiresMessageQueue[BoundedMessageQueue
             val bid = row.nextBoolean.get
             val stationid = row.nextLong.get
             val systemid = row.nextLong.get
-            val system = StaticProvider.systemsMap(systemid)
-            // Get a mock station if required
-            val station = StaticProvider.stationsMap.getOrElse(stationid, Station(stationid, "Unknown", "Unknown", system))
+
+            // Get a mock system or station if required (i.e. not in the database?)
             val region = StaticProvider.regionsMap(row.nextLong.get)
+            val system = StaticProvider.systemsMap.getOrElse(systemid, SolarSystem(systemid, "Unknown", 0.0, region, 0))
+            val station = StaticProvider.stationsMap.getOrElse(stationid, Station(stationid, "Unknown", "Unknown", system))
             val range = row.nextInt.get
             val volremain = row.nextLong.get
             val volenter = row.nextLong.get
@@ -82,6 +86,8 @@ class GetOrdersActor extends Actor with RequiresMessageQueue[BoundedMessageQueue
             )
         }
     }
+    log.info("ORDERS: Fetched for " + typeLimit.toString)
+    orders
   }
 
   def receive = {

diff --git a/import/import_types.py b/import/import_types.py
@@ -33,6 +33,8 @@
     published = 0
 
     description = fields[3].strip()
+    if fields[7] == '':
+        fields[7] = '0.001'
     volume = float(fields[7])
     if volume == 0:
         volume = 0.001