Merge pull request ericvaandering#104 from ericvaandering/docdb_8_8_12

Docdb 8 8 12

Author: ericvaandering

DocDB/cgi/DocDBGlobals.pm

@@ -28,6 +28,7 @@
 
 $TRUE  = 1;
 $FALSE = 0;
+$MySQLVersion = 8;
 
 # Advertising link for DocDB
 

DocDB/cgi/DocDBVersion.pm

@@ -21,6 +21,6 @@
 #    along with DocDB; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-$DocDBVersion = "8.8.11";
+$DocDBVersion = "8.8.12";
 
 1;

DocDB/cgi/SearchAtoms.pm

@@ -113,13 +113,21 @@ sub RegExpSearchAtom {
   }
 
   if ($RequireWord) {
-    $RegExpAtom .= '[[:<:]]';
+    if $MySQLVersion < 8 {
+      $RegExpAtom .= '[[:<:]]';
+    } else {
+      $RegExpAtom .= '\\b';
+    }
   }
   $RegExpAtom .= '(';
   $RegExpAtom .= join '|', @RegExpParts;
   $RegExpAtom .= ')';
   if ($RequireWord) {
-    $RegExpAtom .= '[[:>:]]';
+    if $MySQLVersion < 8 {
+      $RegExpAtom .= '[[:>:]]';
+    } else {
+      $RegExpAtom .= '\\b';
+    }
   }
 
   my $SafeAtom = $dbh->quote($RegExpAtom);

docker/Dockerfile

@@ -8,19 +8,21 @@ RUN yum install -y httpd mod_ssl \
                    sudo git \
                    perl perl-CPAN perl-CGI perl-DBI perl-DBD-MySQL perl-DateTime perl-File-MimeInfo \
                    perl-MailTools perl-XML-Twig perl-libxml-perl perl-DateTime-Format-ICal perl-libwww-perl \
-                   perl-Data-ICal python-pip perl-Digest-SHA1 \
-                   sendmail sendmail-cf \
+                   perl-Data-ICal python-pip perl-Digest-SHA1 perl-XML-Simple \
+                   sendmail sendmail-cf python3 pip3 \
                    && yum clean all \
                    && rm -rf /var/cache/yum
 
+
+
 # Jobber is a lightweight cron replacement written in Go
 RUN rpm -i https://github.com/dshearer/jobber/releases/download/v1.4.4/jobber-1.4.4-1.el8.x86_64.rpm
 ADD dot-jobber.yaml /root/.jobber
 
 # j2cli is used for templating config files which will be useful for passing environment variables
-RUN pip install --no-cache-dir --upgrade pip
-RUN pip install --no-cache-dir --upgrade setuptools
-RUN pip install --no-cache-dir j2cli
+RUN python3 -m pip install --no-cache-dir --upgrade pip
+RUN python3 -m pip install --no-cache-dir --upgrade setuptools
+RUN python3 -m pip install --no-cache-dir j2cli
 
 # This file was generated by running CPAN once in "manual" not "local::lib" mode
 ADD MyConfig.pm /root/.cpan/CPAN/MyConfig.pm