Changeset 252 for Dev/branches/jQueryUI/server/classes/models/Respondent.php

Timestamp:

02/10/12 15:25:42 (13 years ago)

Author:

jkraaijeveld

Message:

Ticket #5: Added emails to users and respondents. This replaces the original 'name' field.

File:

• Dev/branches/jQueryUI/server/classes/models/Respondent.php (modified) (6 diffs)

Dev/branches/jQueryUI/server/classes/models/Respondent.php

@@ -15 +15 @@
         private static $filename = 'data/users/respondents.rdf';
 
-        public $name;
+        public $email;
         public $password;
 
@@ -21 +21 @@
          * Constructor for a Respondent object
          * @param type $uid
-         * @param type $name
+         * @param type $email
          * @param type password
          */
-        public function __construct($uid = null, $name = null, $password = null)
+        public function __construct($uid = null, $email = null, $password = null)
         {
         if(!isset($uid))
@@ -32 +32 @@
       
         $this->uid = $uid;
-        $this->name = $name;
+        $this->email = $email;
         $this->password = $password;
         }
@@ -60 +60 @@
         $model->add(new Statement($resourceRespondent,$predicateUniqueID,$literalRespondentID));
         
-        $literalRespondentName = new Literal($this->name);
-        $predicateName = new Resource(NAME);
+        $literalRespondentName = new Literal($this->email);
+        $predicateName = new Resource(EMAIL);
         $model->add(new Statement($resourceRespondent,$predicateName,$literalRespondentName));                  
 
@@ -85 +85 @@
             PREFIX  predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
             PREFIX  resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
-            SELECT ?uid, ?name, ?password
+            SELECT ?uid, ?email, ?password
             WHERE       
             {
                     _respondent predicates:resource_type        resources:respondent ;
                                         predicates:uid ?uid ;
-                                        predicates:name ?name ;
+                                        predicates:email ?email ;
                                         predicates:password ?password ;
                                         ' . ResearchToolObject::createArguments($arguments) .  '
@@ -102 +102 @@
             foreach($results as $result)
             { 
-                    $respondents[] = new Respondent($result['?uid']->label, $result['?name']->label, $result['?password']->label);
+                    $respondents[] = new Respondent($result['?uid']->label, $result['?email']->label, $result['?password']->label);
             }
         }