[taler-taler-mdb] branch master updated (8c3dd6a -> 76317ca)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dominik-hofer pushed a change to branch master
in repository taler-mdb.

    from 8c3dd6a  Commented Code
     new c5eacc3  Added Error message backend not reachable
     new 5b222ba  Added new product to conf file
     new 76317ca  Changed Ausverkauft to Sold Out

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main.c | 22 +++++++++++++++++-----
 taler.conf |  4 ++--
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main.c b/src/main.c
index 14062c6..54da007 100644
--- a/src/main.c
+++ b/src/main.c
@@ -217,8 +217,9 @@ along with
 /* Display Request for Sold Out product */
 #define READER_DISPLAY_REQUEST "02"
 #define READER_DISPLAY_REQUEST_TIME "32"
-#define READER_DISPLAY_SOLD_OUT 
"202020202020202020204175737665726b617566742020202020202020202020"
+#define READER_DISPLAY_SOLD_OUT 
"202020202020202050726f6475637420736f6c64206f75742020202020202020"
 #define READER_DISPLAY_INTERNAL_ERROR 
"202020496e7465726e616c204572726f72202d2054727920416761696e202020i"
+#define READER_DISPLAY_BACKEND_NOT_REACHABLE 
"20202020204261636b656e64206e6f7420726561636861626c65202020202020" 
 
 /* Unused reader commands */
 #define READER_SESSION_CANCEL_REQUEST "04"
@@ -655,6 +656,12 @@ static struct MdbCommand readerDisplaySoldOut;
  * Display Request for Error Message
  */
 static struct MdbCommand readerDisplayInternalError;
+
+/**
+ * Display Request for Error Message
+ */
+static struct MdbCommand readerDisplayBackendNotReachable;
+
 /**
  * Terminate session.
  */
@@ -1340,7 +1347,7 @@ check_payment_cb (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Backend request to /check-payment failed: %u\n",
                 http_status);
-    mdb.cmd = &denyVend;
+    mdb.cmd = &readerDisplayBackendNotReachable;
     run_mdb_event_loop ();
     cleanup_payment (pa);
     GNUNET_assert (payment_activity == pa);
@@ -1439,7 +1446,7 @@ proposal_cb (void *cls,
                 "Failed to setup order with backend: %u/%d\n",
                 http_status,
                 (int) ec);
-    mdb.cmd = &denyVend;
+    mdb.cmd = &readerDisplayBackendNotReachable;
     run_mdb_event_loop ();
     cleanup_payment (pa);
     GNUNET_assert (payment_activity == pa);
@@ -1941,7 +1948,8 @@ handle_ack ()
                mdb.cmd = &denyVend;
        if (&readerDisplayInternalError == mdb.last_cmd)
                mdb.cmd = &denyVend;
-
+       if (&readerDisplayBackendNotReachable == mdb.last_cmd)
+               mdb.cmd = &denyVend;
   mdb.last_cmd = NULL;
   /* Cause the write-task to be re-scheduled now */
   if (NULL != mdb.wtask)
@@ -3031,7 +3039,11 @@ main (int argc,
                                                                                
                                                                                
                        READER_DISPLAY_REQUEST,
                                                                                
                                                                                
                        READER_DISPLAY_REQUEST_TIME
                                                                                
                                                                                
                        READER_DISPLAY_INTERNAL_ERROR);
-
+       
+       readerDisplayBackendNotReachable = setup_mdb_cmd ("Display Backend not 
reachable",
+                                                                               
                                                                                
                                                READER_DISPLAY_REQUEST,
+                                                                               
                                                                                
                                                READER_DISPLAY_REQUEST_TIME
+                                                                               
                                                                                
                                                
READER_DISPLAY_BACKEND_NOT_REACHABLE);
   ret = GNUNET_PROGRAM_run (argc,
                             argv,
                             "taler-mdb",
diff --git a/taler.conf b/taler.conf
index 397e1f9..7d925de 100644
--- a/taler.conf
+++ b/taler.conf
@@ -38,8 +38,8 @@ number = 45
 
 #machine number 53
 [product-19]
-description = empty
-price = EUR:0.0
+description = Hackerspace Passport
+price = EUR:1.0
 number = 44
 
 #machine number 52

-- 
To stop receiving notification emails like this one, please contact
address@hidden.