From 35d1601c1043f50f7555ae96ce8241e4f88bdefe Mon Sep 17 00:00:00 2001
From: Penny Leach <penny@mjollnir.org>
Date: Mon, 9 Mar 2009 13:58:26 +0100
Subject: [PATCH] Postgres fixes - change binary types to text and use ints for int fields.

---
 question/type/dragdrop/db/install.xml |    8 ++++----
 question/type/dragdrop/dragdrop.php   |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/question/type/dragdrop/db/install.xml b/question/type/dragdrop/db/install.xml
index 190804e..c4c9e67 100644
--- a/question/type/dragdrop/db/install.xml
+++ b/question/type/dragdrop/db/install.xml
@@ -11,8 +11,8 @@
         <FIELD NAME="dragdropmedia" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="backgroundmedia" NEXT="freestyle"/>
         <FIELD NAME="freestyle" TYPE="int" LENGTH="4" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="dragdropmedia" NEXT="feedbackfraction"/>
         <FIELD NAME="feedbackfraction" TYPE="char" LENGTH="10" NOTNULL="true" DEFAULT="0.0" SEQUENCE="false" ENUM="false" PREVIOUS="freestyle" NEXT="feedbackok"/>
-        <FIELD NAME="feedbackok" TYPE="binary" LENGTH="big" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="feedbackfraction" NEXT="feedbackmissed"/>
-        <FIELD NAME="feedbackmissed" TYPE="binary" LENGTH="big" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="feedbackok" NEXT="arrangemedia"/>
+        <FIELD NAME="feedbackok" TYPE="text" LENGTH="big" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="feedbackfraction" NEXT="feedbackmissed"/>
+        <FIELD NAME="feedbackmissed" TYPE="text" LENGTH="big" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="feedbackok" NEXT="arrangemedia"/>
         <FIELD NAME="arrangemedia" TYPE="int" LENGTH="4" NOTNULL="true" UNSIGNED="false" DEFAULT="0" ENUM="false" PREVIOUS="feedbackmissed" NEXT="placemedia"/>
         <FIELD NAME="placemedia" TYPE="int" LENGTH="4" NOTNULL="true" UNSIGNED="false" DEFAULT="0" ENUM="false" PREVIOUS="arrangemedia"/>
       </FIELDS>
@@ -39,9 +39,9 @@
       <FIELDS>
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="questionid"/>
         <FIELD NAME="questionid" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="questiontext"/>
-        <FIELD NAME="questiontext" TYPE="binary" LENGTH="big" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="questionid" NEXT="media"/>
+        <FIELD NAME="questiontext" TYPE="text" LENGTH="big" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="questionid" NEXT="media"/>
         <FIELD NAME="media" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="questiontext" NEXT="alt"/>
-        <FIELD NAME="alt" TYPE="binary" LENGTH="big" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="media" NEXT="width"/>
+        <FIELD NAME="alt" TYPE="text" LENGTH="big" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="media" NEXT="width"/>
         <FIELD NAME="width" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="alt" NEXT="height"/>
         <FIELD NAME="height" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="width" NEXT="mimetype"/>
         <FIELD NAME="mimetype" TYPE="char" LENGTH="100" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="height" NEXT="targetx"/>
diff --git a/question/type/dragdrop/dragdrop.php b/question/type/dragdrop/dragdrop.php
index 1d451b5..3023b22 100644
--- a/question/type/dragdrop/dragdrop.php
+++ b/question/type/dragdrop/dragdrop.php
@@ -613,7 +613,7 @@ class dragdrop {
         $positions = array();
         foreach ($gapform as $key=>$value) {
             if (preg_match($pattern, $key, $matches)) {
-                $positions[$matches[2]][$matches[1]][$matches[3]] = $value;
+                $positions[$matches[2]][$matches[1]][$matches[3]] = (int)$value;
             }
         }
         return $positions;
-- 
1.6.1.3