Subversion Repositories spk

Rev

Rev 131 | Rev 160 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 131 Rev 159
Line 947... Line 947...
947 
//		if ( pos == -1 ) { pos = v.findPos("²", 0); len = 1; }
947 
//		if ( pos == -1 ) { pos = v.findPos("²", 0); len = 1; }
948 
	if ( pos != -1 ) {
948 
	if ( pos != -1 ) {
949 
		beta2 = checkStr.right(-(pos + len)).remove(' ');
949 
		beta2 = checkStr.right(-(pos + len)).remove(' ');
950 
		checkStr = checkStr.left(pos).removeEndSpace();
950 
		checkStr = checkStr.left(pos).removeEndSpace();
951 
	}
951 
	}
- 
 
 952
- 
 
 953 
	bool isDecimal = thisStr.countToken(".") == 2 && checkStr.countToken(".") == 2;
952
954
953 
	while ( true ) {
955 
	while ( true ) {
954 
		Utils::String sNum1 = thisStr.token(".", section);
956 
		Utils::String sNum1 = thisStr.token(".", section);
955 
		Utils::String sNum2 = checkStr.token(".", section);
957 
		Utils::String sNum2 = checkStr.token(".", section);
956
958
Line 1002... Line 1004...
1002 
			cNum2 = toupper(sNum2[(int)sNum2.length() - 1]);
1004 
			cNum2 = toupper(sNum2[(int)sNum2.length() - 1]);
1003 
			sNum2.truncate(-1);
1005 
			sNum2.truncate(-1);
1004 
		}
1006 
		}
1005
1007
1006 
		// now make sure each section is the correct length
1008 
		// now make sure each section is the correct length
1007 
		if ( section > 1 )
 1009 
		if ( isDecimal && section > 1 )
1008 
		{
1010 
		{
1009 
			while ( sNum1.length() < sNum2.length() )
1011 
			while ( sNum1.length() < sNum2.length() )
1010 
				sNum1 += "0";
1012 
				sNum1 += "0";
1011 
			while ( sNum2.length() < sNum1.length() )
1013 
			while ( sNum2.length() < sNum1.length() )
1012 
				sNum2 += "0";
1014 
				sNum2 += "0";