Changeset 32096 for main

Timestamp:

2017-12-12T16:47:34+13:00 (6 years ago)

Author:

ak19

Message:

Marking all the uses of sysread() with a comment saying they're a candidate to use FileUtils::readUTF8File() in future, if thinking about each case beforehand has confirmed that the contents will indeed be UTF8.

Location:

main/trunk/greenstone2

Files:

• bin/script/gti.pl (modified) (1 diff)
• bin/script/replace_srcdoc_with_html.pl (modified) (1 diff)
• perllib/plugins/HTMLPlugin.pm (modified) (1 diff)
• perllib/plugins/ReadTextFile.pm (modified) (1 diff)
• perllib/servercontrol.pm (modified) (1 diff)
• perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/bin/script/gti.pl

@@ -773 +773 @@
     &FileUtils::copyFilesRecursiveNoSVN($en_helpxml_file, $glihelp_lang_dir);
 
+    # The following file reading section is a candidate to use FileUtils::readUTF8File()
+    # in place of calling sysread() directly. But only if we can reason we'd be working with UTF8
     # In gli/help/<newlang>/help.xml, replace all occurrences of 
     # <Text id="1">This text in en will be removed for new langcode</Text> 

main/trunk/greenstone2/bin/script/replace_srcdoc_with_html.pl

@@ -187 +187 @@
     }
 
+    # The following file reading section is a candidate to use FileUtils::readUTF8File()
+    # in place of calling sysread() directly. But only if we can reason we'd be working with UTF8
     # Now we know we have no file name collisions. We 'move' the html file by copying its
     # contents over and ensuring that these contents are utf8. If we don't do this, PDFs

main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm

@@ -962 +962 @@
     
     my $css_filename_dirname = &File::Basename::dirname($css_filename);
-    
+
+    # The following file reading section is a candidate to use FileUtils::readUTF8File()
+    # in place of calling sysread() directly. But only if we can reason we'd be working with UTF8
     open (CSSFILE, $css_filename) || return;
     sysread (CSSFILE, my $file_string, -s CSSFILE);

main/trunk/greenstone2/perllib/plugins/ReadTextFile.pm

@@ -216 +216 @@
      
     if ($encoding eq "ascii") {
+    # The following file reading section is a candidate to use FileUtils::readUTF8File()
+    # in place of calling sysread() directly. But only if we can reason we'd be working with UTF8.
+    # ascii is UTF8, but it may become inefficient to treat ascii as utf8
+    
     # Replace file 'slurp' with faster implementation
     sysread(FILE, $$textref, -s FILE);

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -201 +201 @@
         # check the page content is as expected
         #my $resultstr = $response_content;
-        
+
+            # The following file reading section is a candidate to use FileUtils::readUTF8File()
+    # in place of calling sysread() directly. But only if we can reason we'd be working with UTF8
         open(FIN,"<$tmpfilename") or die "servercontrol.pm: Unable to open $tmpfilename to read ping response page...ERROR: $!\n";
         my $resultstr;

main/trunk/greenstone2/perllib/util.pm

@@ -1280 +1280 @@
         # check llssite.cfg for line with url property
         # for server.exe also need to use portnumber and enterlib properties            
-        
+        # The following file reading section is a candidate to use FileUtils::readUTF8File()
+        # in place of calling sysread() directly. But only if we can reason we'd be working with UTF8
         # Read in the entire contents of the file in one hit
         if (!open (FIN, $llssite_cfg)) {