[Arsperl-devel] ARSperl ARS.xs, 1.125, 1.126 Makefile.PL, 1.86, 1.87 StructDef.pl, 1.9, 1.10 change
Brought to you by:
jeffmurphy
From: Thilo S. <ts...@us...> - 2010-09-01 17:18:39
|
Update of /cvsroot/arsperl/ARSperl In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15696 Modified Files: ARS.xs Makefile.PL StructDef.pl changes.dat rev_AR_template.pl support-h.template support.c supportrev_generated.c supportrev_generated.h Log Message: arsystem 7.6.3 port Index: rev_AR_template.pl =================================================================== RCS file: /cvsroot/arsperl/ARSperl/rev_AR_template.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** rev_AR_template.pl 2 Apr 2009 18:57:03 -0000 1.6 --- rev_AR_template.pl 1 Sep 2010 17:18:29 -0000 1.7 *************** *** 351,355 **** strncpy( k, "<@ $key2 @>", 255 ); val = hv_fetch( h, "<@ $key2 @>", <@ length($key2) @>, 0 ); ! if( val && *val && SvOK(*val) ){ @> perlToStruct( $obj->{$key}, $class, "$LINE_INDENT\t\t\t" ); }else{ --- 351,355 ---- strncpy( k, "<@ $key2 @>", 255 ); val = hv_fetch( h, "<@ $key2 @>", <@ length($key2) @>, 0 ); ! if( val && *val && <@ ($obj->{$key}{_type} eq 'ARValueStruct')? '(SvOK(*val) || SvTYPE(*val) == SVt_NULL)' : 'SvOK(*val)' @> ){ @> perlToStruct( $obj->{$key}, $class, "$LINE_INDENT\t\t\t" ); }else{ *************** *** 589,593 **** sub versionIf { my( $obj ) = @_; ! if( $obj->{_min_version} ){ return '#if AR_CURRENT_API_VERSION >= ' . $CURRENT_API_VERSION{$obj->{_min_version}}; }elsif( $obj->{_max_version} ){ --- 589,595 ---- sub versionIf { my( $obj ) = @_; ! if( $obj->{_min_version} && $obj->{_max_version} ){ ! return '#if AR_CURRENT_API_VERSION >= '. $CURRENT_API_VERSION{$obj->{_min_version}} .' && AR_CURRENT_API_VERSION <= '. $CURRENT_API_VERSION{$obj->{_max_version}}; ! }elsif( $obj->{_min_version} ){ return '#if AR_CURRENT_API_VERSION >= ' . $CURRENT_API_VERSION{$obj->{_min_version}}; }elsif( $obj->{_max_version} ){ Index: changes.dat =================================================================== RCS file: /cvsroot/arsperl/ARSperl/changes.dat,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** changes.dat 1 Apr 2009 15:04:50 -0000 1.64 --- changes.dat 1 Sep 2010 17:18:29 -0000 1.65 *************** *** 1,3 **** --- 1,7 ---- released=xx/xx/xxx version=1.92 + TS modifications for AR 7.6.3 API + TS ars_GetEntryBLOB bugfix by Conny Martin + TS fixed "hv_fetch error" problem in case of undefined ARValueStruct + TS fixed SignalTypeMap problem TS package directory reorganization/cleanup TS additional ars_Login parameters by Conny Martin *************** *** 5,9 **** TS fixed incorrect AR_ARITH_OP_NEGATE handling in rev_ARArithOpStruct TS fixed wrong operand evaluation for AR_ARITH_OP_NEGATE in perl_ARArithOpStruct ! TS fixed ars_SetServerInfo() memory violation in case of more than key/value pair TS ars_GetFieldTable performance improvement by using ARGetMultipleFields TS removed unnecessary second invocation of ARGetField in ars_GetField --- 9,13 ---- TS fixed incorrect AR_ARITH_OP_NEGATE handling in rev_ARArithOpStruct TS fixed wrong operand evaluation for AR_ARITH_OP_NEGATE in perl_ARArithOpStruct ! TS fixed ars_SetServerInfo() memory violation in case of more than one key/value pair TS ars_GetFieldTable performance improvement by using ARGetMultipleFields TS removed unnecessary second invocation of ARGetField in ars_GetField Index: ARS.xs =================================================================== RCS file: /cvsroot/arsperl/ARSperl/ARS.xs,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** ARS.xs 2 Apr 2009 18:57:02 -0000 1.125 --- ARS.xs 1 Sep 2010 17:18:29 -0000 1.126 *************** *** 287,290 **** --- 287,292 ---- DBG( ("safemalloc ARControlStruct\n") ); ctrl = (ARControlStruct *)safemalloc(sizeof(ARControlStruct)); + /* DBG( ("malloc ARControlStruct\n") ); + ctrl = (ARControlStruct *)MALLOCNN(sizeof(ARControlStruct)); */ Zero(ctrl, 1, ARControlStruct); #endif *************** *** 569,573 **** Zero(&status, 1, ARStatusList); [...1260 lines suppressed...] + #else FreeARMultiSchemaFieldIdList( &getListFields, FALSE ); FreeARMultiSchemaFieldValueListList( &entryFieldValueList, FALSE ); + #endif + FreeARMultiSchemaSortList( &sortList, FALSE ); #else /* prior to ARS 7.5 */ (void) ARError_reset(); *************** *** 7416,7420 **** }else{ signalList.signalList[i].signalType = st; ! signalList.signalList[i].sigArgument = SvPV(ST(a),PL_na); } } --- 7702,7706 ---- }else{ signalList.signalList[i].signalType = st; ! signalList.signalList[i].sigArgument = SvPV(ST(a+1),PL_na); } } Index: Makefile.PL =================================================================== RCS file: /cvsroot/arsperl/ARSperl/Makefile.PL,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** Makefile.PL 14 Dec 2009 17:31:38 -0000 1.86 --- Makefile.PL 1 Sep 2010 17:18:29 -0000 1.87 *************** *** 45,49 **** # STEP 2 -> Choose your version of ARS FROM THE FOLLOWING LIST # ! # 5.0 6.0 6.01 6.3 7.0 7.1 7.5 # # notes --- 45,49 ---- # STEP 2 -> Choose your version of ARS FROM THE FOLLOWING LIST # ! # 5.0 6.0 6.01 6.3 7.0 7.1 7.5 7.6 # # notes *************** *** 56,60 **** # 4.52) # ! $ARSVERSION = 7.5; --- 56,60 ---- # 4.52) # ! $ARSVERSION = 7.6; Index: support.c =================================================================== RCS file: /cvsroot/arsperl/ARSperl/support.c,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** support.c 31 Mar 2009 17:41:17 -0000 1.69 --- support.c 1 Sep 2010 17:18:29 -0000 1.70 *************** *** 3501,3508 **** --- 3501,3514 ---- #endif ARValueStruct * defaultVal, + #if AR_CURRENT_API_VERSION >= 17 + ARPermissionList * assignedGroupList, + #endif ARPermissionList * perm, ARFieldLimitStruct * limit, ARDisplayInstanceList * display, char **help, ARTimestamp * timestamp, ARNameType owner, ARNameType lastChanged, char **changeDiary, + #if AR_CURRENT_API_VERSION >= 17 + ARPropList * objPropList, + #endif ARStatusList * Status) { *************** *** 3514,3518 **** char field_string[20]; ! #if AR_CURRENT_API_VERSION >= 12 /* cache fieldName and dataType */ if (fieldMap || option || createMode || fieldOption || defaultVal || perm || limit || --- 3520,3532 ---- char field_string[20]; ! #if AR_CURRENT_API_VERSION >= 17 ! /* cache fieldName and dataType */ ! if (fieldMap || option || createMode || fieldOption || defaultVal || assignedGroupList || perm || limit || ! display || help || timestamp || owner || lastChanged || changeDiary || objPropList) { ! (void) ARError_add(ARSPERL_TRACEBACK, 1, ! "ARGetFieldCached: uncached parameter requested."); ! goto cache_fail; ! } ! #elif AR_CURRENT_API_VERSION >= 12 /* cache fieldName and dataType */ if (fieldMap || option || createMode || fieldOption || defaultVal || perm || limit || *************** *** 3576,3580 **** cache_fail:; ! #if AR_CURRENT_API_VERSION >= 12 ret = ARGetField(ctrl, schema, id, my_fieldName, fieldMap, &my_dataType, option, createMode, fieldOption, defaultVal, perm, limit, --- 3590,3600 ---- cache_fail:; ! ! #if AR_CURRENT_API_VERSION >= 17 ! ret = ARGetField(ctrl, schema, id, my_fieldName, fieldMap, &my_dataType, ! option, createMode, fieldOption, defaultVal, assignedGroupList, perm, limit, ! display, help, timestamp, owner, lastChanged, ! changeDiary, objPropList, Status); ! #elif AR_CURRENT_API_VERSION >= 12 ret = ARGetField(ctrl, schema, id, my_fieldName, fieldMap, &my_dataType, option, createMode, fieldOption, defaultVal, perm, limit, *************** *** 3760,3763 **** --- 3780,3786 ---- #endif NULL, /* defaultVal */ + #if AR_CURRENT_API_VERSION >= 17 + NULL, /* assginedGrouList */ + #endif NULL, /* permissions */ NULL, /* limit */ *************** *** 3768,3771 **** --- 3791,3797 ---- NULL, /* lastChanged */ NULL, /* changeDiary */ + #if AR_CURRENT_API_VERSION >= 17 + NULL, /* objPropListList */ + #endif &status ); #ifdef PROFILE Index: StructDef.pl =================================================================== RCS file: /cvsroot/arsperl/ARSperl/StructDef.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** StructDef.pl 14 Apr 2009 16:58:24 -0000 1.9 --- StructDef.pl 1 Sep 2010 17:18:29 -0000 1.10 *************** *** 16,19 **** --- 16,20 ---- '7.1.0' => '13', '7.5.0' => '14', + '7.6.3' => '17', ); *************** *** 160,163 **** --- 161,168 ---- _type => 'unsigned int', _data => 'p->fullTextOptions', + _map => { + AR_FULLTEXT_OPTIONS_NONE => 'none', + AR_FULLTEXT_OPTIONS_INDEXED => 'indexed', + }, }, }, *************** *** 2068,2071 **** --- 2073,2077 ---- }, AR_STAT_HISTORY => { + _max_version => '7.5.0', statHistory => { _type => 'ARMultiSchemaStatHistoryValue', *************** *** 2073,2076 **** --- 2079,2089 ---- }, }, + AR_STAT_HISTORY => { + _min_version => '7.6.3', + statHistory => { + _type => 'ARMultiSchemaFuncStatHistoryValue', + _data => 'p->u.statHistory', + }, + }, AR_VALUE_SET => { valueSet => { *************** *** 2081,2084 **** --- 2094,2098 ---- AR_CURRENCY_FLD => { _min_version => '5.1.0', + _max_version => '7.5.0', currencyField => { _type => 'ARMultiSchemaCurrencyPartStruct*', *************** *** 2086,2090 **** --- 2100,2112 ---- }, }, + AR_CURRENCY_FLD => { + _min_version => '7.6.3', + currencyField => { + _type => 'ARMultiSchemaFuncCurrencyPartStruct*', + _data => 'p->u.currencyField', + }, + }, AR_VALUE_SET_QUERY => { + _max_version => '7.5.0', queryValue => { _type => 'ARMultiSchemaValueSetQueryStruct*', *************** *** 2092,2095 **** --- 2114,2124 ---- }, }, + AR_VALUE_SET_QUERY => { + _min_version => '7.6.3', + queryValue => { + _type => 'ARMultiSchemaValueSetFuncQueryStruct*', + _data => 'p->u.valueSetQuery', + }, + }, }, }, *************** *** 2112,2115 **** --- 2141,2145 ---- ARMultiSchemaCurrencyPartStruct => { _min_version => '7.5.0', + _max_version => '7.5.0', fieldId => { _type => 'ARMultiSchemaFieldIdStruct', *************** *** 2180,2183 **** --- 2210,2526 ---- }, + ARMultiSchemaFuncStatHistoryValue => { + _min_version => '7.6.3', + queryFromAlias => { + _type => 'ARNameType', + _data => 'p->queryFromAlias', + }, + enumVal => { + _type => 'unsigned long', + _data => 'p->enumVal', + }, + userOrTime => { + _type => 'unsigned int', + _data => 'p->userOrTime', + }, + funcId => { + _type => 'int', + _data => 'p->funcId', + }, + }, + ARMultiSchemaFuncCurrencyPartStruct => { + _min_version => '7.6.3', + fieldFunc => { + _type => 'ARMultiSchemaFieldFuncStruct', + _data => 'p->fieldFunc', + }, + partTag => { + _type => 'unsigned int', + _data => 'p->partTag', + }, + currencyCode => { + _type => 'ARCurrencyCodeType', + _data => 'p->currencyCode', + }, + }, + ARMultiSchemaValueSetFuncQueryStruct => { + _min_version => '7.6.3', + queryFromList => { + _type => 'ARMultiSchemaFuncQueryFromList', + _data => 'p->queryFromList', + }, + fieldId => { + _type => 'ARMultiSchemaFieldIdStruct', + _data => 'p->fieldId', + }, + qualifier => { + _type => 'ARMultiSchemaQualifierStruct*', + _data => 'p->qualifier', + }, + groupBy => { + _type => 'ARMultiSchemaFieldIdList', + _data => 'p->groupBy', + }, + having => { + _type => 'ARMultiSchemaFuncQualifierStruct*', + _data => 'p->having', + }, + }, + ARMultiSchemaFuncQueryFromList => { + _min_version => '7.6.3', + _num => 'p->numItems', + _list => 'p->listPtr', + _type => 'ARMultiSchemaFuncQueryFromStruct', + }, + ARMultiSchemaFuncQueryFromStruct => { + _min_version => '7.6.3', + queryFromAlias => { + _type => 'ARNameType', + _data => 'p->queryFromAlias', + }, + joinType => { + _type => 'unsigned int', + _data => 'p->joinType', + }, + joinQual => { + _type => 'ARMultiSchemaQualifierStruct*', + _data => 'p->joinQual', + }, + _switch => 'p->type', + _case => { + AR_MULTI_SCHEMA_SCHEMA_NAME => { + 'name' => { + _type => 'ARNameType', + _data => 'p->u.schemaName', + }, + }, + AR_MULTI_SCHEMA_NESTED_QUERY => { + 'extRef' => { + _type => 'ARMultiSchemaNestedFuncQueryStruct*', + _data => 'p->u.nestedQuery', + }, + }, + AR_MULTI_SCHEMA_RECURSIVE_QUERY => { + 'extRef' => { + _type => 'ARMultiSchemaRecursiveFuncQueryStruct*', + _data => 'p->u.recursiveQuery', + }, + }, + }, + }, + ARMultiSchemaFuncQualifierStruct => { + _min_version => '7.6.3', + _switch => 'p->operation', + _map => [ 'oper', { + AR_COND_OP_AND => 'and', + AR_COND_OP_OR => 'or', + AR_COND_OP_NOT => 'not', + AR_COND_OP_REL_OP => 'rel_op', + AR_COND_OP_FROM_FIELD => 'external', + } ], + _case => { + AR_COND_OP_NONE => { + _default => 1, + }, + AR_COND_OP_AND => { + left => { + _type => 'ARMultiSchemaFuncQualifierStruct*', + _data => 'p->u.andor.operandLeft', + }, + right => { + _type => 'ARMultiSchemaFuncQualifierStruct*', + _data => 'p->u.andor.operandRight', + }, + }, + AR_COND_OP_OR => { + left => { + _type => 'ARMultiSchemaFuncQualifierStruct*', + _data => 'p->u.andor.operandLeft', + }, + right => { + _type => 'ARMultiSchemaFuncQualifierStruct*', + _data => 'p->u.andor.operandRight', + }, + }, + AR_COND_OP_NOT => { + 'not' => { + _type => 'ARMultiSchemaFuncQualifierStruct*', + _data => 'p->u.notQual', + }, + }, + AR_COND_OP_REL_OP => { + rel_op => { + _type => 'ARMultiSchemaFuncRelOpStruct*', + _data => 'p->u.relOp', + }, + }, + AR_COND_OP_FROM_FIELD => { + fieldFunc => { + _type => 'ARMultiSchemaFieldFuncStruct', + _data => 'p->u.fieldFunc', + }, + }, + }, + }, + ARMultiSchemaNestedFuncQueryStruct => { + _min_version => '7.6.3', + queryFromList => { + _type => 'ARMultiSchemaFuncQueryFromList', + _data => 'p->queryFromList', + }, + getListFuncs => { + _type => 'ARMultiSchemaFieldFuncList', + _data => 'p->getListFuncs', + }, + qualifier => { + _type => 'ARMultiSchemaQualifierStruct*', + _data => 'p->qualifier', + }, + groupBy => { + _type => 'ARMultiSchemaFieldIdList', + _data => 'p->groupBy', + }, + having => { + _type => 'ARMultiSchemaFuncQualifierStruct*', + _data => 'p->having', + }, + }, + ARMultiSchemaFieldFuncList => { + _min_version => '7.6.3', + _num => 'p->numItems', + _list => 'p->listPtr', + _type => 'ARMultiSchemaFieldFuncStruct', + }, + ARMultiSchemaFieldFuncStruct => { + _min_version => '7.6.3', + queryFromAlias => { + _type => 'ARNameType', + _data => 'p->queryFromAlias', + }, + fieldId => { + _type => 'ARInternalId', + _data => 'p->fieldId', + }, + funcId => { + _type => 'int', + _data => 'p->funcId', + }, + }, + ARMultiSchemaFuncRelOpStruct => { + _min_version => '7.6.3', + operation => { + _type => 'unsigned int', + _data => 'p->operation', + }, + operandLeft => { + _type => 'ARMultiSchemaFieldFuncValueOrArithStruct', + _data => 'p->operandLeft', + }, + operandRight => { + _type => 'ARMultiSchemaFieldFuncValueOrArithStruct', + _data => 'p->operandRight', + }, + }, + ARMultiSchemaRecursiveFuncQueryStruct => { + _min_version => '7.6.3', + recursiveSchemaAlias => { + _type => 'ARNameType', + _data => 'p->recursiveSchemaAlias', + }, + queryFromList => { + _type => 'ARMultiSchemaFuncQueryFromList', + _data => 'p->queryFromList', + }, + getListFuncs => { + _type => 'ARMultiSchemaFieldFuncList', + _data => 'p->getListFuncs', + }, + startQual => { + _type => 'ARMultiSchemaQualifierStruct*', + _data => 'p->startQual', + }, + recursionQual => { + _type => 'ARMultiSchemaQualifierStruct*', + _data => 'p->recursionQual', + }, + levelsToRetrieve => { + _type => 'int', + _data => 'p->levelsToRetrieve', + }, + groupBy => { + _type => 'ARMultiSchemaFieldIdList', + _data => 'p->groupBy', + }, + having => { + _type => 'ARMultiSchemaFuncQualifierStruct*', + _data => 'p->having', + }, + }, + ARMultiSchemaFieldFuncValueOrArithStruct => { + _min_version => '7.6.3', + _switch => 'p->tag', + _case => { + AR_FIELD => { + fieldFunc => { + _type => 'ARMultiSchemaFieldFuncStruct', + _data => 'p->u.fieldFunc', + }, + }, + AR_VALUE => { + value => { + _type => 'ARValueStruct', + _data => 'p->u.value', + }, + }, + AR_ARITHMETIC => { + arith => { + _type => 'ARMultiSchemaFuncArithOpStruct*', + _data => 'p->u.arithOp', + }, + }, + AR_STAT_HISTORY => { + statHistory => { + _type => 'ARMultiSchemaFuncStatHistoryValue', + _data => 'p->u.statHistory', + }, + }, + AR_VALUE_SET => { + valueSet => { + _type => 'ARValueList', + _data => 'p->u.valueSet', + }, + }, + AR_CURRENCY_FLD => { + _min_version => '5.1.0', + currencyField => { + _type => 'ARMultiSchemaFuncCurrencyPartStruct*', + _data => 'p->u.currencyField', + }, + }, + AR_VALUE_SET_QUERY => { + queryValue => { + _type => 'ARMultiSchemaValueSetFuncQueryStruct*', + _data => 'p->u.valueSetQuery', + }, + }, + }, + }, + ARMultiSchemaFuncArithOpStruct => { + _min_version => '7.6.3', + operation => { + _type => 'unsigned int', + _data => 'p->operation', + }, + operandLeft => { + _type => 'ARMultiSchemaFieldFuncValueOrArithStruct', + _data => 'p->operandLeft', + }, + operandRight => { + _type => 'ARMultiSchemaFieldFuncValueOrArithStruct', + _data => 'p->operandRight', + }, + }, + + #ARMultiSchemaFieldIdStruct => { Index: supportrev_generated.c =================================================================== RCS file: /cvsroot/arsperl/ARSperl/supportrev_generated.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** supportrev_generated.c 14 Apr 2009 16:58:24 -0000 1.10 --- supportrev_generated.c 1 Sep 2010 17:18:29 -0000 1.11 *************** *** 1383,1387 **** strncpy( k, "value", 255 ); val = hv_fetch( h, "value", 5, 0 ); ! if( val && *val && SvOK(*val) ){ { rev_ARValueStruct( ctrl, h, k, "dataType", &(p->u.value) ); --- 1383,1387 ---- strncpy( k, "value", 255 ); val = hv_fetch( h, "value", 5, 0 ); ! if( val && *val && (SvOK(*val) || SvTYPE(*val) == SVt_NULL) ){ { [...2239 lines suppressed...] + ARError_add(AR_RETURN_WARNING, AP_ERR_GENERAL, "rev_ARMultiSchemaValueSetFuncQueryStruct: hv_fetch returned null"); + return -2; + } + }else{ + ARError_add(AR_RETURN_WARNING, AP_ERR_GENERAL, "rev_ARMultiSchemaValueSetFuncQueryStruct: key doesn't exist"); + ARError_add(AR_RETURN_WARNING, AP_ERR_GENERAL, k ); + return -2; + } + }else{ + ARError_add(AR_RETURN_ERROR, AP_ERR_GENERAL, "rev_ARMultiSchemaValueSetFuncQueryStruct: first argument is not a hash"); + return -1; + } + + return 0; + } + #endif + + #if AR_CURRENT_API_VERSION >= 14 int Index: support-h.template =================================================================== RCS file: /cvsroot/arsperl/ARSperl/support-h.template,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** support-h.template 31 Mar 2009 17:41:17 -0000 1.36 --- support-h.template 1 Sep 2010 17:18:29 -0000 1.37 *************** *** 340,344 **** char *name; } SignalTypeMap[] = { - { 0, NULL }, /*SIGNALTYPEMAP*/ { TYPEMAP_LAST, NULL } --- 340,343 ---- *************** *** 468,475 **** --- 467,480 ---- #endif ARValueStruct *, + #if AR_CURRENT_API_VERSION >= 17 + ARPermissionList *assignedGroupList, + #endif ARPermissionList *, ARFieldLimitStruct *, ARDisplayInstanceList *, char **, ARTimestamp *, ARNameType, ARNameType, char **, + #if AR_CURRENT_API_VERSION >= 17 + ARPropList *objPropList, + #endif ARStatusList *); Index: supportrev_generated.h =================================================================== RCS file: /cvsroot/arsperl/ARSperl/supportrev_generated.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** supportrev_generated.h 14 Apr 2009 16:58:24 -0000 1.9 --- supportrev_generated.h 1 Sep 2010 17:18:29 -0000 1.10 *************** *** 245,251 **** ! #if AR_CURRENT_API_VERSION >= 14 EXTERN int rev_ARMultiSchemaCurrencyPartStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaCurrencyPartStruct *p ); #endif #if AR_CURRENT_API_VERSION >= 14 EXTERN int rev_ARMultiSchemaFieldIdList( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaFieldIdList *p ); --- 245,260 ---- ! #if AR_CURRENT_API_VERSION >= 14 && AR_CURRENT_API_VERSION <= 14 EXTERN int rev_ARMultiSchemaCurrencyPartStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaCurrencyPartStruct *p ); #endif + #if AR_CURRENT_API_VERSION >= 17 + EXTERN int rev_ARMultiSchemaFieldFuncList( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaFieldFuncList *p ); + #endif + #if AR_CURRENT_API_VERSION >= 17 + EXTERN int rev_ARMultiSchemaFieldFuncStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaFieldFuncStruct *p ); + #endif + #if AR_CURRENT_API_VERSION >= 17 + EXTERN int rev_ARMultiSchemaFieldFuncValueOrArithStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaFieldFuncValueOrArithStruct *p ); + #endif #if AR_CURRENT_API_VERSION >= 14 EXTERN int rev_ARMultiSchemaFieldIdList( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaFieldIdList *p ); *************** *** 254,257 **** --- 263,290 ---- EXTERN int rev_ARMultiSchemaFieldValueOrArithStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaFieldValueOrArithStruct *p ); #endif + #if AR_CURRENT_API_VERSION >= 17 + EXTERN int rev_ARMultiSchemaFuncArithOpStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaFuncArithOpStruct *p ); + #endif + #if AR_CURRENT_API_VERSION >= 17 + EXTERN int rev_ARMultiSchemaFuncCurrencyPartStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaFuncCurrencyPartStruct *p ); + #endif + #if AR_CURRENT_API_VERSION >= 17 + EXTERN int rev_ARMultiSchemaFuncQualifierStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaFuncQualifierStruct *p ); + #endif + #if AR_CURRENT_API_VERSION >= 17 + EXTERN int rev_ARMultiSchemaFuncQueryFromList( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaFuncQueryFromList *p ); + #endif + #if AR_CURRENT_API_VERSION >= 17 + EXTERN int rev_ARMultiSchemaFuncQueryFromStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaFuncQueryFromStruct *p ); + #endif + #if AR_CURRENT_API_VERSION >= 17 + EXTERN int rev_ARMultiSchemaFuncRelOpStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaFuncRelOpStruct *p ); + #endif + #if AR_CURRENT_API_VERSION >= 17 + EXTERN int rev_ARMultiSchemaFuncStatHistoryValue( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaFuncStatHistoryValue *p ); + #endif + #if AR_CURRENT_API_VERSION >= 17 + EXTERN int rev_ARMultiSchemaNestedFuncQueryStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaNestedFuncQueryStruct *p ); + #endif #if AR_CURRENT_API_VERSION >= 14 EXTERN int rev_ARMultiSchemaNestedQueryStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaNestedQueryStruct *p ); *************** *** 266,269 **** --- 299,305 ---- EXTERN int rev_ARMultiSchemaQueryFromStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaQueryFromStruct *p ); #endif + #if AR_CURRENT_API_VERSION >= 17 + EXTERN int rev_ARMultiSchemaRecursiveFuncQueryStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaRecursiveFuncQueryStruct *p ); + #endif #if AR_CURRENT_API_VERSION >= 14 EXTERN int rev_ARMultiSchemaRecursiveQueryStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaRecursiveQueryStruct *p ); *************** *** 281,284 **** --- 317,323 ---- EXTERN int rev_ARMultiSchemaStatHistoryValue( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaStatHistoryValue *p ); #endif + #if AR_CURRENT_API_VERSION >= 17 + EXTERN int rev_ARMultiSchemaValueSetFuncQueryStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaValueSetFuncQueryStruct *p ); + #endif #if AR_CURRENT_API_VERSION >= 14 EXTERN int rev_ARMultiSchemaValueSetQueryStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaValueSetQueryStruct *p ); |