[LON-CAPA-cvs] cvs: doc /loncapafiles updatequery.piml

[raeburn]

raeburn		Fri Dec 31 17:58:57 2010 EDT

  Modified files:              
    /doc/loncapafiles	updatequery.piml 
  Log:
  - Correction to regexpes used to extract protocol and internet domain when
    updating existing installations.
  
  
Index: doc/loncapafiles/updatequery.piml
diff -u doc/loncapafiles/updatequery.piml:1.65 doc/loncapafiles/updatequery.piml:1.66
--- doc/loncapafiles/updatequery.piml:1.65	Wed Jul 21 00:32:44 2010
+++ doc/loncapafiles/updatequery.piml	Fri Dec 31 17:58:57 2010
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.65 2010/07/21 00:32:44 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.66 2010/12/31 17:58:57 raeburn Exp $ -->
 
 <!--
 
@@ -694,8 +694,9 @@
         foreach my $file (@hosts_files) {
             open(IN,'&lt;'.$file);
             while(my $line = &lt;IN&gt;) {
-                if ($line =~ /^\Q$perlvar{'lonHostID'}\E:\Q$perlvar{'lonDefDomain'}\E\:(?:access|library)\:(https?)/) {
+                if ($line =~ /^\Q$perlvar{'lonHostID'}\E:\Q$perlvar{'lonDefDomain'}\E\:(?:access|library)\:[^:]+\:(https?)/) {
                     $protocol = $1;
+                    chomp($protocol);
                     last;
                 }
             }
@@ -710,8 +711,9 @@
         foreach my $file (@hosts_files) {
             open(IN,'&lt;'.$file);
             while(my $line = &lt;IN&gt;) {
-                if ($line =~ /^\Q$perlvar{'lonHostID'}\E:\Q$perlvar{'lonDefDomain'}\E\:(?:access|library)\:https?:([^:]+)/) {
+                if ($line =~ /^\Q$perlvar{'lonHostID'}\E:\Q$perlvar{'lonDefDomain'}\E\:(?:access|library)\:[^:]+\:https?\:([^:]+)/) {
                     $intdom = $1;
+                    chomp($intdom);
                     last;
                 }
             }