Changeset 181

Show
Ignore:
Timestamp:
04/15/08 08:46:34
Author:
dan
Message:

UnitsStringConversion? added some checking and removing of non printable ASCII characters.
KMLAddPlacemarkSimple correct latitude and longitude variables.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • obskml/trunk/General/obsKMLSubRoutines.pm

    r175 r181  
    249249{ 
    250250  my ($strFromUOMString, $XMLDoc) = @_; 
     251 
    251252  my $strConvertedString = ''; 
     253  #DWR 4/15/2008 
     254  #Remove any characters we don't want used. I did notice the unicode char "\x" was in some ndbc files. 
     255  $strFromUOMString =~ tr/\x80-\xFF//d; 
     256  $strFromUOMString =~ s/\x//; 
     257   
     258  #print( "UnitsStringConversion:: XMLLookup: //unit_conversion_list/unit_conversion[\@id=\"$strFromUOMString\"]/units\n"); 
    252259  my $strConversionString = $XMLDoc->findvalue('//unit_conversion_list/unit_conversion[@id="'.$strFromUOMString.'"]/units'); 
    253260  if( length( $strConversionString ) ) 
    …… 
    255262    $strConvertedString = $strConversionString; 
    256263  } 
    257   print "$strConvertedString \n"; 
     264  print "Units: $strConvertedString \n"; 
    258265  return $strConvertedString; 
    259266  
    …… 
    359366{ 
    360367  my ( $strObsName, $strDate, $Value, $SensorSOrder, $strPlatformID, $ObsElevation, $strUnits, $rObsHash ) = @_; 
    361   #print( "KMLAddObsToHash:: Obs: $strObsName Date: $strDate Val: $Value SORder: $SensorSOrder Platform: $strPlatformID Elev: $ObsElevation Units: $strUnits\n" ); 
     368  print( "KMLAddObsToHash:: Obs: $strObsName Date: $strDate Val: $Value SORder: $SensorSOrder Platform: $strPlatformID Elev: $ObsElevation Units: $strUnits\n" ); 
    362369  my $QCLevel = $QCLEVEL_DATANOTEVALD; 
    363370  $rObsHash->{PlatformID}{$strPlatformID}{TimeStamp}{$strDate}{elev}{$ObsElevation}{obsType}{$strObsName}{uomType} = $strUnits; 
    …… 
    496503  my $Longitude =  $hObsList->{PlatformID}{$strPlatformID}{Longitude};        
    497504   
    498   KMLAddLatLong( $Doc, $Placemark, $Longitude, $Latitude ); 
     505  KMLAddLatLong( $Doc, $Placemark, $Latitude, $Longitude ); 
    499506  KMLAddTimeStamp( $Doc, $Placemark, $Date ); 
    500507