srchub Commit Details

Date:

2014-12-20 20:02:23 (10 years 3 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

f597b1ac25cef95dd8475235fc78b2a22d3bad56

Parents:

1f4586ec92f7e7231f9a6f56c43c368bfaa1db12

Message:

Fixing issue 72

Changes:

File differences

-26
27 27
28 28
29 
29
30 30
31 31
32 32
... ...
45 45
46 46
47 47
48 
48
49 49
50 50
51 51
+    $db = Pluf::db();␊
    $table = $db->pfx.'idf_project_idf_tag_assoc';␊
    if (!in_array($db->engine, array('MySQL', 'PostgreSQL'))) {␊
        throw new Exception('unsupported engine '.$engine);␊
        throw new Exception('unsupported engine '.$db->engine);␊
    }␊
␊
    $intro = new Pluf_DB_Introspect($db);␊

    $db = Pluf::db();␊
    $table = $db->pfx.'idf_project_idf_tag_assoc';␊
    if (!in_array($db->engine, array('MySQL', 'PostgreSQL'))) {␊
        throw new Exception('unsupported engine '.$engine);␊
        throw new Exception('unsupported engine '.$db->engine);␊
    }␊
␊
    $intro = new Pluf_DB_Introspect($db);␊
 ...
     $db = Pluf::db();␊
     $table = $db->pfx.'idf_project_idf_tag_assoc';␊
     if (!in_array($db->engine, array('MySQL', 'PostgreSQL'))) {␊
-        throw new Exception('unsupported engine '.$engine);␊
+        throw new Exception('unsupported engine '.$db->engine);␊
     }␊
 ␊
     $intro = new Pluf_DB_Introspect($db);␊
     $db = Pluf::db();␊
     $table = $db->pfx.'idf_project_idf_tag_assoc';␊
     if (!in_array($db->engine, array('MySQL', 'PostgreSQL'))) {␊
-        throw new Exception('unsupported engine '.$engine);␊
+        throw new Exception('unsupported engine '.$db->engine);␊
     }␊
 ␊
     $intro = new Pluf_DB_Introspect($db);␊

-597
598 598
599 599
600 
600
601 601
602 602
603 603
... ...
716 716
717 717
718 718
719 
719
720 720
721 721
722 722
... ...
789 789
790 790
791 791
792 
792
793 793
794 794
795 795
+                catch (Exception $e) {␊
                    $this->_diagnoseProblem(sprintf(␊
                        __('Could not parse read-permissions for project "%1$s": %2$s'),␊
                        $shortname, $e->getMessage()␊
                        $project->shortname, $e->getMessage()␊
                    ));␊
                }␊
␊

                catch (Exception $e) {␊
                    $this->_diagnoseProblem(sprintf(␊
                        __('Could not parse read-permissions for project "%1$s": %2$s'),␊
                        $shortname, $e->getMessage()␊
                        $project->shortname, $e->getMessage()␊
                    ));␊
                }␊
␊

            Pluf_Log::event(array(␊
                'IDF_Plugin_SyncMonotone::processSyncTimeline',␊
                'Project not found.',␊
                array($project_name, $params)␊
                array($project_name)␊
            ));␊
            return false; // Project not found␊
        }␊
 ...
 ...
                 catch (Exception $e) {␊
                     $this->_diagnoseProblem(sprintf(␊
                         __('Could not parse read-permissions for project "%1$s": %2$s'),␊
-                        $shortname, $e->getMessage()␊
+                        $project->shortname, $e->getMessage()␊
                     ));␊
                 }␊
 ␊
                 catch (Exception $e) {␊
                     $this->_diagnoseProblem(sprintf(␊
                         __('Could not parse read-permissions for project "%1$s": %2$s'),␊
-                        $shortname, $e->getMessage()␊
+                        $project->shortname, $e->getMessage()␊
                     ));␊
                 }␊
 ␊
             Pluf_Log::event(array(␊
                 'IDF_Plugin_SyncMonotone::processSyncTimeline',␊
                 'Project not found.',␊
-                array($project_name, $params)␊
+                array($project_name)␊
             ));␊
             return false; // Project not found␊
         }␊

-106
107 107
108 108
109 
109
110 110
111 111
112 112
+    function getLastID()␊
    {␊
        $this->debug('* GET LAST ID');␊
        return (int) $this->con_id->lastInsertId();;␊
        return (int) $this->con_id->lastInsertId();␊
    }␊
␊
    /**␊
     function getLastID()␊
     {␊
         $this->debug('* GET LAST ID');␊
-        return (int) $this->con_id->lastInsertId();;␊
+        return (int) $this->con_id->lastInsertId();␊
     }␊
 ␊
     /**␊

-156
157 157
158 158
159 
159
160 160
161 161
162 162
163 163
164 
164
165 165
166 166
+        $this->skip('Pluf has no support for applying filters to a variable of array');␊
        return;␊
␊
        $context = new Pluf_Template_Context(array('one' => 'A',␊
        /*$context = new Pluf_Template_Context(array('one' => 'A',␊
                                                   'two' => '2'));␊
        $to_parse = '{cycle array($one|lower, $two), "counter"}{cycle $counter}';␊
        $expected = 'a2';␊
        $tpl = $this->getNewTemplate($to_parse);␊
        $this->assertEqual($expected, $tpl->render($context));␊
        $this->assertEqual($expected, $tpl->render($context));*/␊
    }␊
}␊
         $this->skip('Pluf has no support for applying filters to a variable of array');␊
         return;␊
 ␊
-        $context = new Pluf_Template_Context(array('one' => 'A',␊
+        /*$context = new Pluf_Template_Context(array('one' => 'A',␊
                                                    'two' => '2'));␊
         $to_parse = '{cycle array($one|lower, $two), "counter"}{cycle $counter}';␊
         $expected = 'a2';␊
         $tpl = $this->getNewTemplate($to_parse);␊
-        $this->assertEqual($expected, $tpl->render($context));␊
+        $this->assertEqual($expected, $tpl->render($context));*/␊
     }␊
 }␊

Download the corresponding diff file

srchub

File differences

Branches