[Arsperl-devel] ARSperl/infra exsi.pl,1.7,1.8

[Thilo S. <ts...@us...>]

Update of /cvsroot/arsperl/ARSperl/infra
In directory vz-cvs-4.sog:/tmp/cvs-serv16358/infra

Modified Files:
	exsi.pl 
Log Message:
arsystem 7.6.4 port

Index: exsi.pl
===================================================================
RCS file: /cvsroot/arsperl/ARSperl/infra/exsi.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** exsi.pl	1 Sep 2010 17:18:29 -0000	1.7
--- exsi.pl	29 Jul 2011 13:05:28 -0000	1.8
***************
*** 16,21 ****
  #
  # $Log$
! # Revision 1.7  2010/09/01 17:18:29  tstapff
! # arsystem 7.6.3 port
  #
  # Revision 1.6  2009/12/14 17:30:56  jeffmurphy
--- 16,21 ----
  #
  # $Log$
! # Revision 1.8  2011/07/29 13:05:28  tstapff
! # arsystem 7.6.4 port
  #
  # Revision 1.6  2009/12/14 17:30:56  jeffmurphy
***************
*** 46,49 ****
--- 46,50 ----
  
  my $ct = 0;  # counter for completeness check
+ my $apiVersion;
  
  while(<>) {
***************
*** 51,54 ****
--- 52,57 ----
  	chomp;
  	
+ 	$apiVersion = $1 if /#define\s+AR_CURRENT_API_VERSION\s+(\d+)/;
+ 
  	# jump thru hoops
  
***************
*** 56,72 ****
  	# name value type type2
  
! 	if(/\#define\s+(AR_SERVER_INFO_\S+)\s+(\d+)\s*\/\*\s*(\S+)\s+(\S+)?/) {
! 		($sin, $siv, $sit, $sit2) = ($1, $2, $3, $4);
! 	}elsif(/\#define\s+(AR_SERVER_INFO_\S+)\s+(\d+)\s*$/){
! 		($sin, $siv) = ($1, $2);
! 		$_ = <>;
! 		if( /^\s*\/\*\s+(\S+)\s+(\S+)?/) {
! 			($sit, $sit2) = ($1, $2);
  		}
  	}
  
! 	if( $sin && $siv && $sit ){
  		print "sin $sin siv $siv sit $sit\n" if $D;
! 		++$ct;
  		if ($siv != $ct) {
  			if( $siv <= 324 ){
--- 59,90 ----
  	# name value type type2
  
! 	while( 1 ){
! 		if(/\#define\s+(AR_SERVER_INFO_\S+)\s+(\d+)\s*\/\*\s*(\w+)[-;(\s]+(\S+)?/) {
! 			($sin, $siv, $sit, $sit2) = ($1, $2, $3, $4);
! #			print STDERR "\$sin <", $sin, ">  \$siv <", $siv, ">  \$sit <", $sit, ">  \$sit2 <", $sit2, ">\n";  # _DEBUG_
! 		}elsif(/\#define\s+(AR_SERVER_INFO_\S+)\s+(\d+)\s*$/){
! 			($sin, $siv) = ($1, $2);
! 			$_ = <>;
! 			if( /^\s*\/\*\s+(\S+)\s+(\S+)?/) {
! 				($sit, $sit2) = ($1, $2);
! 			}else{
! 				next;
! 			}
  		}
+ 		last;
  	}
  
! 	if( defined $sin && defined $siv && defined $sit ){
  		print "sin $sin siv $siv sit $sit\n" if $D;
! 		if( $apiVersion == 14 && $ct == 324 ){
! 			$ct += 9;
! 		}elsif( $apiVersion >= 17 && $ct == 326 ){
! 			$ct += 4;
! 		}elsif( $apiVersion >= 17 && $ct == 339 ){
! 			$ct += 2;
! 		}else{
! 			++$ct;
! 		}
! #		print STDERR "($ct) sin $sin siv $siv sit $sit\n";
  		if ($siv != $ct) {
  			if( $siv <= 324 ){
***************
*** 123,126 ****
--- 141,146 ----
  		$sit = "int" if $sin eq "AR_SERVER_INFO_MFS_KEYWORDS_FIELD_WEIGHT";      # 329
  
+ 		$sit = "int" if $sin eq "AR_SERVER_INFO_OVERLAY_MODE";                   # 341
+ 
  		#print "\t/*$sin [$siv] is an $sit*/\n";