Working output of portcim parse.

galaxy.cpp

@@ -23,6 +23,16 @@ std::ostream &operator<<(std::ostream &os, const buysell_text &bst) {
   return os;
 }
 
+std::ostream &operator<<(std::ostream &os, const port &p) {
+  if (p.type == 0) {
+    os << p.sector << ": " << (int)p.type;
+  } else {
+    os << p.sector << ": " << (int)p.type << " " << text_from_type(p.type)
+       << " " << p.amount[0] << "," << p.amount[1] << "," << p.amount[2];
+  }
+  return os;
+}
+
 sector_warps::sector_warps() {
   sector = 0;
   for (int x = 0; x < MAX_WARPS; ++x)

galaxy.h

@@ -36,7 +36,7 @@ struct buysell_text {
 typedef uint16_t sector_type;
 
 struct sector_warps {
-  sector_type sector;
+  sector_type sector;   // Yes, for debug
   // std::set<sector_type> warps;  // possibly
   sector_type warps[MAX_WARPS];
   // ports
@@ -150,6 +150,7 @@ struct port {
   uint8_t type;
   uint16_t amount[3];
   uint8_t percent[3];
+  friend std::ostream& operator<<(std::ostream& os, const port &p);
 };
 
 struct port parse_portcim(const std::string line);

session.cpp

@@ -235,7 +235,7 @@ void Session::on_server_line(const std::string &line) {
   // Do I need to run through the tests (below) before calling the parser here?
   // Or will the parsers know when they are done processing, and clear?
 
-  // ok, maybe that was the end of parsing?
+  // Yes, run through the various tests, then call SL_parser.
 
   if ((line.substr(0, 19) == "The shortest path (") ||
       (line.substr(0, 7) == "  TO > ")) {
@@ -291,11 +291,17 @@ void Session::SL_cimline(const std::string &line) {
 
   if (pos == line.npos) {
     // warpcim
-
+    BUGZ_LOG(fatal) << "warpcim: [" << line << "]";
   } else {
     // portcim
+    struct port p = parse_portcim(line);
+    if (p.sector == 0)
+      BUGZ_LOG(fatal) << "portcim: [" << line << "]";
+    else
+      BUGZ_LOG(fatal) << "portcim: " << p;
   }
 }
+
 void Session::SL_thiefline(const std::string &line) {
   size_t pos = line.find("Suddenly you're Busted!");
   bool busted = pos != line.npos;
@@ -310,7 +316,10 @@ void Session::SL_thiefline(const std::string &line) {
 
   // Are those the two ways to exit from this state?
 }
-void Session::SL_sectorline(const std::string &line) {}
+void Session::SL_sectorline(const std::string &line) {
+  BUGZ_LOG(fatal) << "sectorline: [" << line << "]";
+}
+
 void Session::SL_portline(const std::string &line) {
   if (line.empty()) {
     SL_parser = nullptr;
@@ -333,7 +342,9 @@ void Session::SL_warpline(const std::string &line) {
   }
 
   // process warp line
+  BUGZ_LOG(fatal) << "warpline: [" << line << "]";
 }
+
 /**
  * Split server input into lines.
  *