mirror of
git://git.psyced.org/git/psyced
synced 2024-08-15 03:25:10 +00:00
Merge remote-tracking branch 'fly/master'
This commit is contained in:
commit
4f7fb2cebe
14 changed files with 53 additions and 13 deletions
|
@ -24,6 +24,7 @@
|
|||
<tr><td>_address_street</td><td>street</td><td>street</td><td>STREET</td><td>ADR/STREET</td><td>street</td><td></td></tr>
|
||||
<tr><td>_address_zone_time</td><td>timezone</td><td></td><td>TZ</td><td>TZ</td><td></td><td></td></tr>
|
||||
<tr><td>_affiliation</td><td>affiliation</td><td>org_name</td><td>ORGNAME</td><td>ORG/ORGNAME</td><td>o</td><td></td></tr>
|
||||
<tr><td>_amount_history_login</td><td>loginhistory</td><td></td><td></td><td></td><td></td><td></td></tr>
|
||||
<tr><td>_character_action</td><td>actioncharacter</td><td></td><td></td><td></td><td></td><td></td></tr>
|
||||
<tr><td>_character_command</td><td>commandcharacter</td><td></td><td></td><td></td><td></td><td></td></tr>
|
||||
<tr><td>_color</td><td>color</td><td></td><td></td><td></td><td></td><td></td></tr>
|
||||
|
|
|
@ -166,6 +166,7 @@ volatile mapping psyc2set = ([
|
|||
"_address_street" : "street",
|
||||
"_address_zone_time" : "timezone",
|
||||
"_affiliation" : "affiliation",
|
||||
"_amount_history_login" : "loginhistory",
|
||||
"_character_action" : "actioncharacter",
|
||||
"_character_command" : "commandcharacter",
|
||||
"_color" : "color",
|
||||
|
@ -288,6 +289,7 @@ volatile mapping set2psyc = ([
|
|||
"street" : "_address_street",
|
||||
"timezone" : "_address_zone_time",
|
||||
"affiliation" : "_affiliation",
|
||||
"loginhistory" : "_amount_history_login",
|
||||
"actioncharacter" : "_character_action",
|
||||
"commandcharacter" : "_character_command",
|
||||
"color" : "_color",
|
||||
|
|
|
@ -21,7 +21,7 @@ while (<main::DATA>) {
|
|||
$_ = $psyc = $1;
|
||||
$psyc{$psyc} = 1;
|
||||
next if /^_INTERNAL/;
|
||||
s/_(address|contact|voice|scheme|source|flag|person|select)//g;
|
||||
s/_(address|amount|contact|voice|scheme|source|flag|person|select)//g;
|
||||
s/_date/_day/g;
|
||||
s/_description/_text/g;
|
||||
s/_favorite/_fave/g;
|
||||
|
@ -633,6 +633,9 @@ jProf places_lived
|
|||
PSYC _place_home
|
||||
set home
|
||||
|
||||
PSYC _amount_history_login
|
||||
#set loginhistory
|
||||
|
||||
PSYC _flag_filter_strangers
|
||||
set filter
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue